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, 148 insertions, 0 deletions

diff --git a/erts/lib_src/pthread/ethread.c b/erts/lib_src/pthread/ethread.c
index 7cf38580c5..c0b1dad0b6 100644
--- a/erts/lib_src/pthread/ethread.c
+++ b/erts/lib_src/pthread/ethread.c
@@ -50,6 +50,8 @@
 #define ETHREAD_IMPL__
 
 #include "ethread.h"
+#undef ETHR_INCLUDE_MONOTONIC_CLOCK__
+#define ETHR_INCLUDE_MONOTONIC_CLOCK__
 #include "ethr_internal.h"
 
 #ifndef ETHR_HAVE_ETHREAD_DEFINES
@@ -237,6 +239,10 @@ ethr_x86_cpuid__(int *eax, int *ebx, int *ecx, int *edx)
 
 #endif /* ETHR_X86_RUNTIME_CONF__ */
 
+#ifdef ETHR_HAVE_ETHR_GET_MONOTONIC_TIME
+static void init_get_monotonic_time(void);
+#endif
+
 /*
  * --------------------------------------------------------------------------
  * Exported functions
@@ -259,6 +265,10 @@ ethr_init(ethr_init_data *id)
 	goto error;
 #endif
 
+#ifdef ETHR_HAVE_ETHR_GET_MONOTONIC_TIME
+    init_get_monotonic_time();
+#endif
+
     res = ethr_init_common__(id);
     if (res != 0)
 	goto error;
@@ -613,6 +623,144 @@ int ethr_kill(const ethr_tid tid, const int sig)
 
 #endif /* #if ETHR_HAVE_ETHR_SIG_FUNCS */
 
+#ifdef ETHR_HAVE_ETHR_GET_MONOTONIC_TIME
+
+static int broken_get_monotonic_time;
+
+#if defined(ETHR_HAVE_CLOCK_GETTIME_MONOTONIC)
+#  ifndef ETHR_MONOTONIC_CLOCK_ID
+#    error ETHR_MONOTONIC_CLOCK_ID should have been defined
+#  endif
+
+ethr_sint64_t
+ethr_get_monotonic_time(void)
+{
+    ethr_sint64_t time;
+    struct timespec ts;
+
+    if (broken_get_monotonic_time)
+	return (ethr_sint64_t) 0;
+
+    if (0 != clock_gettime(ETHR_MONOTONIC_CLOCK_ID, &ts))
+	ETHR_FATAL_ERROR__(errno);
+
+    time = (ethr_sint64_t) ts.tv_sec;
+    time *= (ethr_sint64_t) 1000*1000*1000;
+    time += (ethr_sint64_t) ts.tv_nsec;
+    return time;
+}
+
+#elif defined(ETHR_HAVE_MACH_CLOCK_GET_TIME)
+#  ifndef ETHR_MONOTONIC_CLOCK_ID
+#    error ETHR_MONOTONIC_CLOCK_ID should have been defined
+#  endif
+
+ethr_sint64_t
+ethr_get_monotonic_time(void)
+{
+    ethr_sint64_t time;
+    kern_return_t res;
+    clock_serv_t clk_srv;
+    mach_timespec_t time_spec;
+
+    if (broken_get_monotonic_time)
+	return (ethr_sint64_t) 0;
+    
+    errno = EFAULT;
+    host_get_clock_service(mach_host_self(),
+			   ETHR_MONOTONIC_CLOCK_ID,
+			   &clk_srv);
+    res = clock_get_time(clk_srv, &time_spec);
+    if (res != KERN_SUCCESS)
+	ETHR_FATAL_ERROR__(errno);
+    mach_port_deallocate(mach_task_self(), clk_srv);
+
+    time = (ethr_sint64_t) time_spec.tv_sec;
+    time *= (ethr_sint64_t) 1000*1000*1000;
+    time += (ethr_sint64_t) time_spec.tv_nsec;
+    return time;
+}
+
+#elif defined(ETHR_HAVE_GETHRTIME)
+
+ethr_sint64_t
+ethr_get_monotonic_time(void)
+{
+    if (broken_get_monotonic_time)
+	return (ethr_sint64_t) 0;
+    return (ethr_sint64_t) gethrtime();
+}
+
+#else
+#error missing monotonic clock
+#endif
+
+int
+ethr_get_monotonic_time_is_broken(void)
+{
+    return broken_get_monotonic_time;
+}
+
+#include <string.h>
+#include <ctype.h>
+#include <sys/utsname.h>
+
+static void
+init_get_monotonic_time(void)
+{
+    struct utsname uts;
+    int vsn[3];
+    int i;
+    char *c;
+
+    broken_get_monotonic_time = 0;
+    
+    (void) uname(&uts);
+    
+    for (c = uts.sysname; *c; c++) {
+	if (isupper((int) *c))
+	    *c = tolower((int) *c);
+    }
+
+    c = uts.release;
+    for (i = 0; i < sizeof(vsn)/sizeof(int); i++) {
+	if (!isdigit((int) *c))
+	    vsn[i] = 0;
+	else {
+	    char *c2 = c;
+	    do {
+		c2++;
+	    } while (isdigit((int) *c2));
+	    *c2 = '\0';
+	    vsn[i] = atoi(c);
+	    c = c2;
+	    c++;
+	}
+    }
+
+    if (strcmp("linux", uts.sysname) == 0) {
+	if (vsn[0] < 2
+	    || (vsn[0] == 2 && vsn[1] < 6)
+	    || (vsn[0] == 2 && vsn[1] == 6 && vsn[2] < 33)) {
+	    broken_get_monotonic_time = 1;
+	}
+    }
+    else if (strcmp("sunos", uts.sysname) == 0) {
+	if ((vsn[0] < 5
+	     || (vsn[0] == 5 && vsn[1] < 8))
+#if defined(HAVE_SYSCONF) && defined(_SC_NPROCESSORS_CONF)
+	    && sysconf(_SC_NPROCESSORS_CONF) > 1
+#endif
+	    ) {
+	    broken_get_monotonic_time = 1;
+	}
+    }
+
+}
+			
+
+#endif /* ETHR_HAVE_ETHR_GET_MONOTONIC_TIME */
+
 ETHR_IMPL_NORETURN__
 ethr_abort__(void)
 {