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, 13 insertions, 1 deletions

diff --git a/erts/emulator/beam/atom.names b/erts/emulator/beam/atom.names
index c097866c7e..ae3f30d82f 100644
--- a/erts/emulator/beam/atom.names
+++ b/erts/emulator/beam/atom.names
@@ -109,6 +109,7 @@ atom bag
 atom band
 atom big
 atom bif_return_trap
+atom bif_timer_server
 atom binary
 atom binary_bin_to_list_trap
 atom binary_copy_trap
@@ -144,9 +145,11 @@ atom catchlevel
 atom cd
 atom cdr
 atom cflags
+atom CHANGE='CHANGE'
 atom characters_to_binary_int
 atom characters_to_list_int
 atom clear
+atom clock_service
 atom close
 atom closed
 atom code
@@ -156,6 +159,7 @@ atom compat_rel
 atom compile
 atom compressed
 atom config_h
+atom convert_time_unit
 atom connect
 atom connected
 atom connection_closed
@@ -237,7 +241,7 @@ atom first
 atom firstline
 atom flags
 atom flush
-atom flush_monitor_message
+atom flush_monitor_messages
 atom force
 atom format_cpu_topology
 atom free
@@ -345,6 +349,8 @@ atom message_queue_len
 atom messages
 atom meta
 atom meta_match_spec
+atom micro_seconds
+atom milli_seconds
 atom min_heap_size
 atom min_bin_vheap_size
 atom minor_version
@@ -355,12 +361,15 @@ atom monitored_by
 atom monitor
 atom monitor_nodes
 atom monitors
+atom monotonic
 atom more
 atom multi_scheduling
 atom multiline
+atom nano_seconds
 atom name
 atom named_table
 atom namelist
+atom native
 atom native_addresses
 atom Neq='=/='
 atom Neqeq='/='
@@ -451,6 +460,7 @@ atom ports
 atom port_count
 atom port_limit
 atom port_op
+atom positive
 atom print
 atom priority
 atom private
@@ -510,6 +520,7 @@ atom schedulers_online
 atom scheme
 atom scientific
 atom scope
+atom seconds
 atom sensitive
 atom sequential_tracer
 atom sequential_trace_token
@@ -555,6 +566,7 @@ atom term_to_binary_trap
 atom this
 atom thread_pool_size
 atom threads
+atom time_offset
 atom timeout
 atom timeout_value
 atom Times='*'