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

9 files changed, 36 insertions, 27 deletions

diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
index c2e06d866f..ef1fd63905 100644
--- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_dynamic_SUITE.erl
@@ -35,7 +35,7 @@
 %% which will return the list with the following variables:
 %% localtime = the erlang:localtime() result in list [{date, Date}, {time, Time}]
 %% node = erlang:node() - can be compared in the testcase
-%% now = erlang:now() - easier to compare than localtime()
+%% now = os:timestamp() - easier to compare than localtime()
 %% config_server_pid - pid of the config server, should NOT change!
 %% config_server_vsn - .19
 %% config_server_iteration - a number of iteration config_server's loop done
diff --git a/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl b/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl
index 8463fea645..e65d6584b1 100644
--- a/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl
+++ b/lib/common_test/test/ct_config_SUITE_data/config/test/config_server.erl
@@ -73,7 +73,7 @@ loop(Iteration)->
 		[{localtime, [{date, D}, {time, T}]},
 		 {node, erlang:node()},
 		 {config_server_iteration, Iteration},
-		 {now, erlang:now()},
+		 {now, os:timestamp()},
 		 {config_server_pid, self()},
 		 {config_server_vsn, ?vsn}],
 	    Config2 = if Iteration rem 2 == 0->
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl
index a77d06815e..d926fc55a4 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/timetrap_2_SUITE.erl
@@ -141,12 +141,13 @@ tc3() ->
     [{timetrap,{seconds,2}}].
 
 tc3(_) ->
-    T0 = now(),
+    T0 = erlang:monotonic_time(),
     ct:timetrap(infinity),
     N = list_to_integer(ct:get_config(multiply)),
     ct:comment(io_lib:format("Sleeping for ~w sec...", [4*N])),
     ct:sleep(4000),
-    Diff = timer:now_diff(now(), T0),
+    T1 = erlang:monotonic_time(),
+    Diff = erlang:convert_time_unit(T1-T0, native, micro_seconds),
     if ((Diff < (N*4000000)) or (Diff > (N*4500000))) ->
 	    exit(not_expected);
        true ->
diff --git a/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl b/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl
index 446dd8bfdf..d5b3e0035a 100644
--- a/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl
+++ b/lib/common_test/test/ct_error_SUITE_data/error/test/verify_config.erl
@@ -81,7 +81,7 @@ init(Id, Opts) ->
 -spec id(Opts :: proplists:proplist()) ->
     Id :: term().
 id(Opts) ->
-    now().
+    os:timestamp().
 
 %% @doc Called before init_per_suite is called. Note that this callback is
 %% only called if the CTH is added before init_per_suite is run (eg. in a test
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
index 3c1f5669e8..f8c8725602 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/ct_update_config_SUITE.erl
@@ -26,21 +26,23 @@
 

 -include("ct.hrl").

 

+-define(now, os:timestamp()).

+

 %% Test server callback functions

 init_per_suite(Config) ->

-    [{init_per_suite,now()}|Config].

+    [{init_per_suite,?now}|Config].

 

 end_per_suite(_Config) ->

     ok.

 

 init_per_testcase(_TestCase, Config) ->

-    [{init_per_testcase,now()}|Config].

+    [{init_per_testcase,?now}|Config].

 

 end_per_testcase(_TestCase, _Config) ->

     ok.

 

 init_per_group(GroupName, Config) ->

-    [{init_per_group,now()}|Config].

+    [{init_per_group,?now}|Config].

 

 end_per_group(GroupName, Config) ->

     ok.

diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
index 77783fccf5..5f8eae1f70 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/empty_cth.erl
@@ -87,7 +87,7 @@ id(Opts) ->
     gen_event:notify(?CT_EVMGR_REF, #event{ name = cth, node = node(),
 					    data = {?MODULE, id, [Opts]}}),
     ct:log("~w:id called", [?MODULE]),
-    now().
+    os:timestamp().
 
 %% @doc Called before init_per_suite is called. Note that this callback is
 %% only called if the CTH is added before init_per_suite is run (eg. in a test
diff --git a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
index 2ee0d7da9c..55a1b9a130 100644
--- a/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
+++ b/lib/common_test/test/ct_hooks_SUITE_data/cth/tests/update_config_cth.erl
@@ -24,6 +24,7 @@
 -include_lib("common_test/src/ct_util.hrl").

 -include_lib("common_test/include/ct_event.hrl").

 

+-define(now, os:timestamp()).

 

 %% CT Hooks

 -compile(export_all).

@@ -33,44 +34,44 @@ init(Id, Opts) ->
 

 pre_init_per_suite(Suite, Config, State) ->

     empty_cth:pre_init_per_suite(Suite,Config,State),

-    {[{pre_init_per_suite,now()}|Config],State}.

+    {[{pre_init_per_suite,?now}|Config],State}.

 

 post_init_per_suite(Suite,Config,Return,State) ->

     empty_cth:post_init_per_suite(Suite,Config,Return,State),

-    {[{post_init_per_suite,now()}|Return],State}.

+    {[{post_init_per_suite,?now}|Return],State}.

 

 pre_end_per_suite(Suite,Config,State) ->

     empty_cth:pre_end_per_suite(Suite,Config,State),

-    {[{pre_end_per_suite,now()}|Config],State}.

+    {[{pre_end_per_suite,?now}|Config],State}.

 

 post_end_per_suite(Suite,Config,Return,State) ->

     empty_cth:post_end_per_suite(Suite,Config,Return,State),

-    NewConfig = [{post_end_per_suite,now()}|Config],

+    NewConfig = [{post_end_per_suite,?now}|Config],

     {NewConfig,NewConfig}.

 

 pre_init_per_group(Group,Config,State) ->

     empty_cth:pre_init_per_group(Group,Config,State),

-    {[{pre_init_per_group,now()}|Config],State}.

+    {[{pre_init_per_group,?now}|Config],State}.

 

 post_init_per_group(Group,Config,Return,State) ->

     empty_cth:post_init_per_group(Group,Config,Return,State),

-    {[{post_init_per_group,now()}|Return],State}.

+    {[{post_init_per_group,?now}|Return],State}.

 

 pre_end_per_group(Group,Config,State) ->

     empty_cth:pre_end_per_group(Group,Config,State),

-    {[{pre_end_per_group,now()}|Config],State}.

+    {[{pre_end_per_group,?now}|Config],State}.

 

 post_end_per_group(Group,Config,Return,State) ->

     empty_cth:post_end_per_group(Group,Config,Return,State),

-    {[{post_end_per_group,now()}|Config],State}.

+    {[{post_end_per_group,?now}|Config],State}.

 

 pre_init_per_testcase(TC,Config,State) ->

     empty_cth:pre_init_per_testcase(TC,Config,State),

-    {[{pre_init_per_testcase,now()}|Config],State}.

+    {[{pre_init_per_testcase,?now}|Config],State}.

 

 post_end_per_testcase(TC,Config,Return,State) ->

     empty_cth:post_end_per_testcase(TC,Config,Return,State),

-    {[{post_end_per_testcase,now()}|Config],State}.

+    {[{post_end_per_testcase,?now}|Config],State}.

 

 on_tc_fail(TC, Reason, State) ->

     empty_cth:on_tc_fail(TC,Reason,State).

diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index ca736fe400..ffef8187f3 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -287,10 +287,13 @@ run_ct_run_test(Opts,Config) ->
     Level = proplists:get_value(trace_level, Config),
     test_server:format(Level, "~n[RUN #1] Calling ct:run_test(~p) on ~p~n",
 		       [Opts, CTNode]),
-    T0 = now(),
+    
+    T0 = erlang:monotonic_time(),
     CtRunTestResult = rpc:call(CTNode, ct, run_test, [Opts]),
+    T1 = erlang:monotonic_time(),
+    Elapsed = erlang:convert_time_unit(T1-T0, native, milli_seconds),
     test_server:format(Level, "~n[RUN #1] Got return value ~p after ~p ms~n",
-		       [CtRunTestResult,trunc(timer:now_diff(now(), T0)/1000)]),
+		       [CtRunTestResult,Elapsed]),
     case rpc:call(CTNode, erlang, whereis, [ct_util_server]) of
 	undefined ->
 	    ok;
@@ -313,10 +316,12 @@ run_ct_script_start(Opts, Config) ->
 	     [common_test, run_test_start_opts, Opts1]),
     test_server:format(Level, "[RUN #2] Calling ct_run:script_start() on ~p~n",
 		       [CTNode]),
-    T0 = now(),
+    T0 = erlang:monotonic_time(),
     ExitStatus = rpc:call(CTNode, ct_run, script_start, []),
+    T1 = erlang:monotonic_time(),
+    Elapsed = erlang:convert_time_unit(T1-T0, native, milli_seconds),
     test_server:format(Level, "[RUN #2] Got exit status value ~p after ~p ms~n",
-		       [ExitStatus,trunc(timer:now_diff(now(), T0)/1000)]),
+		       [ExitStatus,Elapsed]),
     ExitStatus.
 
 check_result({_Ok,Failed,{_UserSkipped,_AutoSkipped}},1,_Opts)
@@ -408,7 +413,7 @@ ct_rpc({M,F,A}, Config) ->
 %%%-----------------------------------------------------------------
 %%% random_error/1
 random_error(Config) when is_list(Config) ->
-    random:seed(now()),
+    random:seed(os:timestamp()),
     Gen = fun(0,_) -> ok; (N,Fun) -> Fun(N-1, Fun) end,
     Gen(random:uniform(100), Gen),
 
diff --git a/lib/common_test/test/telnet_server.erl b/lib/common_test/test/telnet_server.erl
index 11959c3e12..e073f0bfa4 100644
--- a/lib/common_test/test/telnet_server.erl
+++ b/lib/common_test/test/telnet_server.erl
@@ -284,10 +284,10 @@ send(Data,State) ->
     
 send_loop(T,Data,State) ->
     dbg("Server sending ~p in loop for ~w ms...~n",[Data,T]),
-    send_loop(now(),T,Data,State).
+    send_loop(os:timestamp(),T,Data,State).
 
 send_loop(T0,T,Data,State) ->
-    ElapsedMS = trunc(timer:now_diff(now(),T0)/1000),
+    ElapsedMS = trunc(timer:now_diff(os:timestamp(),T0)/1000),
     if ElapsedMS >= T ->
 	    ok;
        true ->
@@ -314,7 +314,7 @@ dbg(_F,_A) ->
     io:format("[telnet_server, ~s]\n" ++ _F,[TS|_A]).
 
 timestamp() ->
-    {MS,S,US} = now(),
+    {MS,S,US} = os:timestamp(),
     {{Year,Month,Day}, {Hour,Min,Sec}} =
         calendar:now_to_local_time({MS,S,US}),
     MilliSec = trunc(US/1000),