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

1 files changed, 14 insertions, 4 deletions

diff --git a/erts/emulator/test/timer_bif_SUITE.erl b/erts/emulator/test/timer_bif_SUITE.erl
index c28224729d..da19be3424 100644
--- a/erts/emulator/test/timer_bif_SUITE.erl
+++ b/erts/emulator/test/timer_bif_SUITE.erl
@@ -238,6 +238,7 @@ cleanup(Config) when is_list(Config) ->
     ?line wait_until(fun () -> process_is_cleaned_up(P1) end),
     ?line T1 = erlang:start_timer(10000, P1, "hej"),
     ?line T2 = erlang:send_after(10000, P1, "hej"),
+    receive after 1000 -> ok end,
     ?line Mem = mem(),
     ?line false = erlang:read_timer(T1),
     ?line false = erlang:read_timer(T2),
@@ -250,6 +251,7 @@ cleanup(Config) when is_list(Config) ->
     ?line true = is_integer(erlang:read_timer(T3)),
     ?line true = is_integer(erlang:read_timer(T4)),
     ?line wait_until(fun () -> process_is_cleaned_up(P2) end),
+    receive after 1000 -> ok end,
     ?line false = erlang:read_timer(T3),
     ?line false = erlang:read_timer(T4),
     ?line Mem = mem(),
@@ -455,10 +457,18 @@ registered_process(Config) when is_list(Config) ->
     ?line ok.
 
 mem() ->
-    AA = erlang:system_info(allocated_areas),
-    {value,{bif_timer,Mem}} = lists:keysearch(bif_timer, 1, AA),
-    Mem.
-
+    TSrvs = erts_internal:get_bif_timer_servers(),
+    lists:foldl(fun (Tab, Sz) ->
+			case lists:member(ets:info(Tab, owner), TSrvs) of
+			    true ->
+				ets:info(Tab, memory) + Sz;
+			    false ->
+				Sz
+			end
+		end,
+		0,
+		ets:all())*erlang:system_info({wordsize,external}).
+					    
 process_is_cleaned_up(P) when is_pid(P) ->
     undefined == erts_debug:get_internal_state({process_status, P}).