Merge branch 'rickard/time_api/OTP-11997'

* rickard/time_api/OTP-11997: (22 commits)
  Update primary bootstrap
  inets: Suppress deprecated warning on erlang:now/0
  inets: Cleanup of multiple copies of functions Add inets_lib with common functions used by multiple modules
  inets: Update comments
  Suppress deprecated warning on erlang:now/0
  Use new time API and be back-compatible in inets Remove unused functions and removed redundant test
  asn1 test SUITE: Eliminate use of now/0
  Disable deprecated warning on erlang:now/0 in diameter_lib
  Use new time API and be back-compatible in ssh
  Replace all calls to now/0 in CT with new time API functions
  test_server: Replace usage of erlang:now() with usage of new API
  Replace usage of erlang:now() with usage of new API
  Replace usage of erlang:now() with usage of new API
  Replace usage of erlang:now() with usage of new API
  Replace usage of erlang:now() with usage of new API
  otp_SUITE: Warn for calls to erlang:now/0
  Replace usage of erlang:now() with usage of new API
  Multiple timer wheels
  Erlang based BIF timer implementation for scalability
  Implement ethread events with timeout
  ...

Conflicts:
	bootstrap/bin/start.boot
	bootstrap/bin/start_clean.boot
	bootstrap/lib/compiler/ebin/beam_asm.beam
	bootstrap/lib/compiler/ebin/compile.beam
	bootstrap/lib/kernel/ebin/auth.beam
	bootstrap/lib/kernel/ebin/dist_util.beam
	bootstrap/lib/kernel/ebin/global.beam
	bootstrap/lib/kernel/ebin/hipe_unified_loader.beam
	bootstrap/lib/kernel/ebin/inet_db.beam
	bootstrap/lib/kernel/ebin/inet_dns.beam
	bootstrap/lib/kernel/ebin/inet_res.beam
	bootstrap/lib/kernel/ebin/os.beam
	bootstrap/lib/kernel/ebin/pg2.beam
	bootstrap/lib/stdlib/ebin/dets.beam
	bootstrap/lib/stdlib/ebin/dets_utils.beam
	bootstrap/lib/stdlib/ebin/erl_tar.beam
	bootstrap/lib/stdlib/ebin/escript.beam
	bootstrap/lib/stdlib/ebin/file_sorter.beam
	bootstrap/lib/stdlib/ebin/otp_internal.beam
	bootstrap/lib/stdlib/ebin/qlc.beam
	bootstrap/lib/stdlib/ebin/random.beam
	bootstrap/lib/stdlib/ebin/supervisor.beam
	bootstrap/lib/stdlib/ebin/timer.beam
	erts/aclocal.m4
	erts/emulator/beam/bif.c
	erts/emulator/beam/erl_bif_info.c
	erts/emulator/beam/erl_db_hash.c
	erts/emulator/beam/erl_init.c
	erts/emulator/beam/erl_process.h
	erts/emulator/beam/erl_thr_progress.c
	erts/emulator/beam/utils.c
	erts/emulator/sys/unix/sys.c
	erts/preloaded/ebin/erlang.beam
	erts/preloaded/ebin/erts_internal.beam
	erts/preloaded/ebin/init.beam
	erts/preloaded/src/erts_internal.erl
	lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
	lib/diameter/src/base/diameter_lib.erl
	lib/kernel/src/os.erl
	lib/ssh/test/ssh_basic_SUITE.erl
	system/doc/efficiency_guide/advanced.xml

4 files changed, 17 insertions, 14 deletions

diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index e32a639b81..d8193a9ec2 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -270,7 +270,8 @@
       <fsummary>Convert now to local date and time</fsummary>
       <desc>
         <p>This function returns local date and time converted from
-          the return value from <c>erlang:now()</c>.</p>
+        the return value from
+	<seealso marker="erts:erlang#timestamp/0"><c>erlang:timestamp/0</c></seealso>.</p>
       </desc>
     </func>
     <func>
@@ -279,7 +280,8 @@
       <fsummary>Convert now to date and time</fsummary>
       <desc>
         <p>This function returns Universal Coordinated Time (UTC)
-          converted from the return value from <c>erlang:now()</c>.</p>
+        converted from the return value from
+	<seealso marker="erts:erlang#timestamp/0"><c>erlang:timestamp/0</c></seealso>.</p>
       </desc>
     </func>
     <func>
diff --git a/lib/stdlib/doc/src/file_sorter.xml b/lib/stdlib/doc/src/file_sorter.xml
index 16572df3c5..c069333c29 100644
--- a/lib/stdlib/doc/src/file_sorter.xml
+++ b/lib/stdlib/doc/src/file_sorter.xml
@@ -105,9 +105,9 @@
       <c>file:get_cwd()</c> is used instead. The names of
        temporary files are derived from the Erlang nodename
        (<c>node()</c>), the process identifier of the current Erlang
-       emulator (<c>os:getpid()</c>), and a timestamp
-       (<c>erlang:now()</c>); a typical name would be
-      <c>fs_mynode@myhost_1763_1043_337000_266005.17</c>, where
+       emulator (<c>os:getpid()</c>), and a unique integer
+       (<c>erlang:unique_integer([positive])</c>); a typical name would be
+      <c>fs_mynode@myhost_1763_4711.17</c>, where
       <c>17</c> is a sequence number. Existing files will be
        overwritten. Temporary files are deleted unless some
        uncaught EXIT signal occurs.
diff --git a/lib/stdlib/doc/src/random.xml b/lib/stdlib/doc/src/random.xml
index e001058e19..2cc621ffc3 100644
--- a/lib/stdlib/doc/src/random.xml
+++ b/lib/stdlib/doc/src/random.xml
@@ -70,12 +70,11 @@
       <desc>
         <p>Seeds random number generation with integer values in the process
           dictionary, and returns the old state.</p>
-        <p>One way of obtaining a seed is to use the BIF <c>now/0</c>:</p>
+        <p>One easy way of obtaining a unique value to seed with is to:</p>
         <code type="none">
-          ...
-          {A1,A2,A3} = now(),
-          random:seed(A1, A2, A3),
-          ...</code>
+          random:seed(<seealso marker="erts:erlang#phash2/1">erlang:phash2</seealso>([<seealso marker="erts:erlang#node/0">node()</seealso>]),
+	              <seealso marker="erts:erlang#monotonic_time/0">erlang:monotonic_time()</seealso>,
+		      <seealso marker="erts:erlang#unique_integer/0">erlang:unique_integer()</seealso>)</code>
       </desc>
     </func>
     <func>
diff --git a/lib/stdlib/doc/src/timer.xml b/lib/stdlib/doc/src/timer.xml
index eca9a72d36..791a29689e 100644
--- a/lib/stdlib/doc/src/timer.xml
+++ b/lib/stdlib/doc/src/timer.xml
@@ -217,12 +217,14 @@
     </func>
     <func>
       <name name="now_diff" arity="2"/>
-      <fsummary>Calculate time difference between <c>now/0</c>timestamps</fsummary>
+      <fsummary>Calculate time difference between timestamps</fsummary>
       <type_desc variable="Tdiff">In microseconds</type_desc>
       <desc>
         <p>Calculates the time difference <c><anno>Tdiff</anno> = <anno>T2</anno> - <anno>T1</anno></c> in
-          <em>microseconds</em>, where <c><anno>T1</anno></c> and <c><anno>T2</anno></c> probably
-          are timestamp tuples returned from <c>erlang:now/0</c>.</p>
+        <em>microseconds</em>, where <c><anno>T1</anno></c> and <c><anno>T2</anno></c>
+        are timestamp tuples on the same format as returned from
+	<seealso marker="erts:erlang#timestamp/0"><c>erlang:timestamp/0</c></seealso>,
+	or <seealso marker="kernel:os#timestamp/0"><c>os:timestamp/0</c></seealso>.</p>
       </desc>
     </func>
     <func>
@@ -234,7 +236,7 @@
     </func>
     <func>
       <name name="minutes" arity="1"/>
-      <fsummary>Converts <c>Minutes</c>to <c>Milliseconds</c>.</fsummary>
+      <fsummary>Converts <c>Minutes</c> to <c>Milliseconds</c>.</fsummary>
       <desc>
         <p>Return the number of milliseconds in <c><anno>Minutes</anno></c>.</p>
       </desc>