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, 154 insertions, 159 deletions

diff --git a/erts/emulator/beam/bif.c b/erts/emulator/beam/bif.c
index 49996e7f0b..af02a55b69 100644
--- a/erts/emulator/beam/bif.c
+++ b/erts/emulator/beam/bif.c
@@ -42,16 +42,22 @@
 #define ERTS_PTAB_WANT_BIF_IMPL__
 #include "erl_ptab.h"
 #include "erl_bits.h"
+#include "erl_bif_unique.h"
 
-static Export* flush_monitor_message_trap = NULL;
+static Export* flush_monitor_messages_trap = NULL;
 static Export* set_cpu_topology_trap = NULL;
 static Export* await_proc_exit_trap = NULL;
 static Export* await_port_send_result_trap = NULL;
 Export* erts_format_cpu_topology_trap = NULL;
 static Export dsend_continue_trap_export;
+Export *erts_convert_time_unit_trap = NULL;
+
 static Export *await_sched_wall_time_mod_trap;
 static erts_smp_atomic32_t sched_wall_time;
 
+static erts_smp_mtx_t ports_snapshot_mtx;
+erts_smp_atomic_t erts_dead_ports_ptr; /* To store dying ports during snapshot */
+
 #define DECL_AM(S) Eterm AM_ ## S = am_atom_put(#S, sizeof(#S) - 1)
 
 /*
@@ -393,7 +399,7 @@ remote_demonitor(Process *c_p, DistEntry *dep, Eterm ref, Eterm to)
     return res;
 }
 
-static int demonitor(Process *c_p, Eterm ref)
+static int demonitor(Process *c_p, Eterm ref, Eterm *multip)
 {
    ErtsMonitor *mon = NULL;  /* The monitor entry to delete */
    Process  *rp;    /* Local target process */
@@ -417,65 +423,73 @@ static int demonitor(Process *c_p, Eterm ref)
        goto done;
    }
 
-   if (mon->type != MON_ORIGIN) {
-       res = ERTS_DEMONITOR_BADARG;
-       goto done;
-   }
-   to = mon->pid;
-
-   if (is_atom(to)) {
-       /* Monitoring a name at node to */
-       ASSERT(is_node_name_atom(to));
-       dep = erts_sysname_to_connected_dist_entry(to);
-       ASSERT(dep != erts_this_dist_entry);
-       if (dep)
-	   deref_de = 1;
-   } else {
-       ASSERT(is_pid(to));
-       dep = pid_dist_entry(to);
-   }
-   if (dep != erts_this_dist_entry) {
-       res = remote_demonitor(c_p, dep, ref, to);
-       /* remote_demonitor() unlocks link lock on c_p */
-       unlock_link = 0;
-   }
-   else { /* Local monitor */
-       if (deref_de) {
-	   deref_de = 0;
-	   erts_deref_dist_entry(dep);
+   switch (mon->type) {
+   case MON_TIME_OFFSET:
+       *multip = am_true;
+       erts_demonitor_time_offset(ref);
+       res = ERTS_DEMONITOR_TRUE;
+       break;
+   case MON_ORIGIN:
+       to = mon->pid;
+       *multip = am_false;
+       if (is_atom(to)) {
+	   /* Monitoring a name at node to */
+	   ASSERT(is_node_name_atom(to));
+	   dep = erts_sysname_to_connected_dist_entry(to);
+	   ASSERT(dep != erts_this_dist_entry);
+	   if (dep)
+	       deref_de = 1;
+       } else {
+	   ASSERT(is_pid(to));
+	   dep = pid_dist_entry(to);
        }
-       dep = NULL;
-       rp = erts_pid2proc_opt(c_p,
-			      ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_LINK,
-			      to,
-			      ERTS_PROC_LOCK_LINK,
-			      ERTS_P2P_FLG_ALLOW_OTHER_X);
-       mon = erts_remove_monitor(&ERTS_P_MONITORS(c_p), ref);
+       if (dep != erts_this_dist_entry) {
+	   res = remote_demonitor(c_p, dep, ref, to);
+	   /* remote_demonitor() unlocks link lock on c_p */
+	   unlock_link = 0;
+       }
+       else { /* Local monitor */
+	   if (deref_de) {
+	       deref_de = 0;
+	       erts_deref_dist_entry(dep);
+	   }
+	   dep = NULL;
+	   rp = erts_pid2proc_opt(c_p,
+				  ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_LINK,
+				  to,
+				  ERTS_PROC_LOCK_LINK,
+				  ERTS_P2P_FLG_ALLOW_OTHER_X);
+	   mon = erts_remove_monitor(&ERTS_P_MONITORS(c_p), ref);
 #ifndef ERTS_SMP
-       ASSERT(mon);
+	   ASSERT(mon);
 #else
-       if (!mon)
-	   res = ERTS_DEMONITOR_FALSE;
-       else
+	   if (!mon)
+	       res = ERTS_DEMONITOR_FALSE;
+	   else
 #endif
-       {
-	   res = ERTS_DEMONITOR_TRUE;
-	   erts_destroy_monitor(mon);
-       }
-       if (rp) {
-	   ErtsMonitor *rmon;
-	   rmon = erts_remove_monitor(&ERTS_P_MONITORS(rp), ref);
-	   if (rp != c_p)
-	       erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
-	   if (rmon != NULL)
-	       erts_destroy_monitor(rmon);
-       }
-       else {
-	   ERTS_SMP_ASSERT_IS_NOT_EXITING(c_p);
-       }
+	   {
+	       res = ERTS_DEMONITOR_TRUE;
+	       erts_destroy_monitor(mon);
+	   }
+	   if (rp) {
+	       ErtsMonitor *rmon;
+	       rmon = erts_remove_monitor(&ERTS_P_MONITORS(rp), ref);
+	       if (rp != c_p)
+		   erts_smp_proc_unlock(rp, ERTS_PROC_LOCK_LINK);
+	       if (rmon != NULL)
+		   erts_destroy_monitor(rmon);
+	   }
+	   else {
+	       ERTS_SMP_ASSERT_IS_NOT_EXITING(c_p);
+	   }
 
+       }
+       break;
+   default:
+       res = ERTS_DEMONITOR_BADARG;
+       *multip = am_false;
+       break;
    }
-
  done:
 
    if (unlock_link)
@@ -492,7 +506,8 @@ static int demonitor(Process *c_p, Eterm ref)
 
 BIF_RETTYPE demonitor_1(BIF_ALIST_1)
 {
-    switch (demonitor(BIF_P, BIF_ARG_1)) {
+    Eterm multi;
+    switch (demonitor(BIF_P, BIF_ARG_1, &multi)) {
     case ERTS_DEMONITOR_FALSE:
     case ERTS_DEMONITOR_TRUE:
 	BIF_RET(am_true);
@@ -510,6 +525,7 @@ BIF_RETTYPE demonitor_1(BIF_ALIST_1)
 BIF_RETTYPE demonitor_2(BIF_ALIST_2)
 {
     Eterm res = am_true;
+    Eterm multi = am_false;
     int info = 0;
     int flush = 0;
     Eterm list = BIF_ARG_2;
@@ -532,13 +548,18 @@ BIF_RETTYPE demonitor_2(BIF_ALIST_2)
     if (is_not_nil(list))
 	goto badarg;
 
-    switch (demonitor(BIF_P, BIF_ARG_1)) {
+    switch (demonitor(BIF_P, BIF_ARG_1, &multi)) {
     case ERTS_DEMONITOR_FALSE:
 	if (info)
 	    res = am_false;
-	if (flush)
-	    BIF_TRAP2(flush_monitor_message_trap, BIF_P, BIF_ARG_1, res);
+	if (flush) {
+	flush_messages:
+	    BIF_TRAP3(flush_monitor_messages_trap, BIF_P,
+		      BIF_ARG_1, multi, res);
+	}
     case ERTS_DEMONITOR_TRUE:
+	if (multi == am_true && flush)
+	    goto flush_messages;
 	BIF_RET(res);
     case ERTS_DEMONITOR_YIELD_TRUE:
 	ERTS_BIF_YIELD_RETURN(BIF_P, am_true);
@@ -597,14 +618,12 @@ erts_queue_monitor_message(Process *p,
 }
 
 static BIF_RETTYPE
-local_pid_monitor(Process *p, Eterm target)
+local_pid_monitor(Process *p, Eterm target, Eterm mon_ref, int bool)
 {
     BIF_RETTYPE ret;
-    Eterm mon_ref;
     Process *rp;
     ErtsProcLocks p_locks = ERTS_PROC_LOCK_MAIN|ERTS_PROC_LOCK_LINK;
 
-    mon_ref = erts_make_ref(p);
     ERTS_BIF_PREP_RET(ret, mon_ref);
     if (target == p->common.id) {
 	return ret;
@@ -617,12 +636,18 @@ local_pid_monitor(Process *p, Eterm target)
     if (!rp) {
 	erts_smp_proc_unlock(p, ERTS_PROC_LOCK_LINK);
 	p_locks &= ~ERTS_PROC_LOCK_LINK;
-	erts_queue_monitor_message(p, &p_locks,
-				   mon_ref, am_process, target, am_noproc);
+	if (bool)
+	    ret = am_false;
+	else
+	    erts_queue_monitor_message(p, &p_locks,
+				       mon_ref, am_process, target, am_noproc);
     }
     else {
 	ASSERT(rp != p);
 
+	if (bool)
+	    ret = am_true;
+
 	erts_add_monitor(&ERTS_P_MONITORS(p), MON_ORIGIN, mon_ref, target, NIL);
 	erts_add_monitor(&ERTS_P_MONITORS(rp), MON_TARGET, mon_ref, p->common.id, NIL);
 
@@ -746,13 +771,28 @@ BIF_RETTYPE monitor_2(BIF_ALIST_2)
     int deref_de = 0;
 
     /* Only process monitors are implemented */
-    if (BIF_ARG_1 != am_process) {
+    switch (BIF_ARG_1) {
+    case am_time_offset: {
+	Eterm ref;
+	if (BIF_ARG_2 != am_clock_service)
+	    goto error;
+	ref = erts_make_ref(BIF_P);
+	erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_LINK);
+	erts_add_monitor(&ERTS_P_MONITORS(BIF_P), MON_TIME_OFFSET,
+			 ref, am_clock_service, NIL);
+	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_LINK);
+	erts_monitor_time_offset(BIF_P->common.id, ref);
+	BIF_RET(ref);
+    }
+    case am_process:
+	break;
+    default:
 	goto error;
     }
 
     if (is_internal_pid(target)) {
     local_pid:
-	ret = local_pid_monitor(BIF_P, target);
+	ret = local_pid_monitor(BIF_P, target, erts_make_ref(BIF_P), 0);
     } else if (is_external_pid(target)) {
 	dep = external_pid_dist_entry(target);
 	if (dep == erts_this_dist_entry)
@@ -795,6 +835,25 @@ BIF_RETTYPE monitor_2(BIF_ALIST_2)
     return ret;
 }
 
+BIF_RETTYPE erts_internal_monitor_process_2(BIF_ALIST_2)
+{
+    if (is_not_internal_pid(BIF_ARG_1)) {
+	if (is_external_pid(BIF_ARG_1)
+	    && (external_pid_dist_entry(BIF_ARG_1)
+		== erts_this_dist_entry)) {
+	    BIF_RET(am_false);
+	}
+	goto badarg;
+    }
+
+    if (is_not_internal_ref(BIF_ARG_2))
+	goto badarg;
+
+    BIF_RET(local_pid_monitor(BIF_P, BIF_ARG_1, BIF_ARG_2, 1));
+
+badarg:
+    BIF_ERROR(BIF_P, BADARG);
+}
 
 /**********************************************************************/
 /* this is a combination of the spawn and link BIFs */
@@ -3542,91 +3601,6 @@ BIF_RETTYPE self_0(BIF_ALIST_0)
 
 /**********************************************************************/
 
-/*
-   New representation of refs in R9, see erl_term.h
-
-   In the first data word, only the usual 18 bits are used. Ordinarily,
-   in "long refs" all words are used (in other words, practically never
-   wrap around), but for compatibility with older nodes, "short refs"
-   exist. Short refs come into being by being converted from the old
-   external format for refs (tag REFERENCE_EXT). Short refs are
-   converted back to the old external format.
-
-   When converting a long ref to the external format in the case of
-   preparing for sending to an older node, the ref is truncated by only
-   using the first word (with 18 significant bits), and using the old tag
-   REFERENCE_EXT.
-
-   When comparing refs or different size, only the parts up to the length
-   of the shorter operand are used. This has the desirable effect that a
-   long ref sent to an old node and back will be treated as equal to
-   the original, although some of the bits have been lost.
-
-   The hash value for a ref always considers only the first word, since
-   in the above scenario, the original and the copy should have the same
-   hash value.
-*/
-
-static Uint32 reference0; /* Initialized in erts_init_bif */
-static Uint32 reference1;
-static Uint32 reference2;
-static erts_smp_spinlock_t make_ref_lock;
-static erts_smp_mtx_t ports_snapshot_mtx;
-erts_smp_atomic_t erts_dead_ports_ptr; /* To store dying ports during snapshot */
-
-void
-erts_make_ref_in_array(Uint32 ref[ERTS_MAX_REF_NUMBERS])
-{
-    erts_smp_spin_lock(&make_ref_lock);
-
-    reference0++;
-    if (reference0 >= MAX_REFERENCE) {
-	reference0 = 0;
-	reference1++;
-	if (reference1 == 0) {
-	    reference2++;
-	}
-    }
-
-    ref[0] = reference0;
-    ref[1] = reference1;
-    ref[2] = reference2;
-
-    erts_smp_spin_unlock(&make_ref_lock);
-}
-
-Eterm erts_make_ref_in_buffer(Eterm buffer[REF_THING_SIZE])
-{
-    Eterm* hp = buffer;
-    Uint32 ref[ERTS_MAX_REF_NUMBERS];
-
-    erts_make_ref_in_array(ref);
-    write_ref_thing(hp, ref[0], ref[1], ref[2]);
-    return make_internal_ref(hp);
-}
-
-Eterm erts_make_ref(Process *p)
-{
-    Eterm* hp;
-    Uint32 ref[ERTS_MAX_REF_NUMBERS];
-
-    ERTS_SMP_LC_ASSERT(ERTS_PROC_LOCK_MAIN & erts_proc_lc_my_proc_locks(p));
-
-    hp = HAlloc(p, REF_THING_SIZE);
-
-    erts_make_ref_in_array(ref);
-    write_ref_thing(hp, ref[0], ref[1], ref[2]);
-
-    return make_internal_ref(hp);
-}
-
-BIF_RETTYPE make_ref_0(BIF_ALIST_0)
-{
-    return erts_make_ref(BIF_P);
-}
-
-/**********************************************************************/
-
 /* return the time of day */
 
 BIF_RETTYPE time_0(BIF_ALIST_0)
@@ -4607,6 +4581,28 @@ BIF_RETTYPE system_flag_2(BIF_ALIST_2)
 	    break;
 	}
 #endif
+    } else if (BIF_ARG_1 == am_time_offset
+	       && ERTS_IS_ATOM_STR("finalize", BIF_ARG_2)) {
+	ErtsTimeOffsetState res;
+	erts_smp_proc_unlock(BIF_P, ERTS_PROC_LOCK_MAIN);
+	res = erts_finalize_time_offset();
+        erts_smp_proc_lock(BIF_P, ERTS_PROC_LOCK_MAIN);
+	switch (res) {
+	case ERTS_TIME_OFFSET_PRELIMINARY: {
+	    DECL_AM(preliminary);
+	    BIF_RET(AM_preliminary);
+	}
+	case ERTS_TIME_OFFSET_FINAL: {
+	    DECL_AM(final);
+	    BIF_RET(AM_final);
+	}
+	case ERTS_TIME_OFFSET_VOLATILE: {
+	    DECL_AM(volatile);
+	    BIF_RET(AM_volatile);
+	}
+	default:
+	    ERTS_INTERNAL_ERROR("Unknown state");
+	}
     } else if (ERTS_IS_ATOM_STR("scheduling_statistics", BIF_ARG_1)) {
 	int what;
 	if (ERTS_IS_ATOM_STR("disable", BIF_ARG_2))
@@ -4894,11 +4890,6 @@ void erts_init_trap_export(Export* ep, Eterm m, Eterm f, Uint a,
 
 void erts_init_bif(void)
 {
-    reference0 = 0;
-    reference1 = 0;
-    reference2 = 0;
-
-    erts_smp_spinlock_init(&make_ref_lock, "make_ref");
     erts_smp_mtx_init(&ports_snapshot_mtx, "ports_snapshot");
     erts_smp_atomic_init_nob(&erts_dead_ports_ptr, (erts_aint_t) NULL);
 
@@ -4919,9 +4910,13 @@ void erts_init_bif(void)
 			  am_erts_internal, am_dsend_continue_trap, 1,
 			  dsend_continue_trap_1);
 
-    flush_monitor_message_trap = erts_export_put(am_erlang,
-						 am_flush_monitor_message,
-						 2);
+    flush_monitor_messages_trap = erts_export_put(am_erts_internal,
+						  am_flush_monitor_messages,
+						  3);
+
+    erts_convert_time_unit_trap = erts_export_put(am_erlang,
+						  am_convert_time_unit,
+						  3);
 
     set_cpu_topology_trap = erts_export_put(am_erlang,
 					    am_set_cpu_topology,