Merge branch 'bmk/erts/esock/timestamps/OTP-15566' into maint

4 files changed, 60 insertions, 98 deletions

diff --git a/erts/configure.in b/erts/configure.in
index 506ce0d0fb..10a006d812 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -1362,6 +1362,13 @@ else
         USE_ESOCK=no
     fi
 fi
+
+if test "x$USE_ESOCK" = "xyes"; then
+    if test "x$USE_ESOCK" = "xyes"; then
+        AC_CHECK_FUNCS([localtime_r strftime])
+    fi
+fi
+
 AC_SUBST(USE_ESOCK)
 
 
diff --git a/erts/emulator/nifs/common/socket_dbg.c b/erts/emulator/nifs/common/socket_dbg.c
index 96f75a328f..7dfc4b77bc 100644
--- a/erts/emulator/nifs/common/socket_dbg.c
+++ b/erts/emulator/nifs/common/socket_dbg.c
@@ -30,6 +30,7 @@
 #include <time.h>
 
 #include <erl_nif.h>
+#include "socket_util.h"
 #include "socket_dbg.h"
 
 #define TSELF()            enif_thread_self()
@@ -38,12 +39,6 @@
 
 static FILE* dbgout = NULL;
 
-#if defined(CLOCK_REALTIME)
-static int realtime(struct timespec* tsP);
-static int timespec2str(char *buf, unsigned int len, struct timespec *ts);
-#endif
-
-
 extern
 void esock_dbg_init(char* filename)
 {
@@ -73,10 +68,7 @@ void esock_dbg_printf( const char* prefix, const char* format, ... )
 {
   va_list         args;
   char            f[512 + sizeof(format)]; // This has to suffice...
-#if defined(CLOCK_REALTIME)
   char            stamp[30];
-  struct timespec ts;
-#endif
   int             res;
 
   /*
@@ -85,64 +77,21 @@ void esock_dbg_printf( const char* prefix, const char* format, ... )
    * But then I must change the API....something for later.
    */
 
-#if defined(CLOCK_REALTIME)
-  if (!realtime(&ts) &&
-      (timespec2str(stamp, sizeof(stamp), &ts) == 0)) {
+  if (esock_timestamp(stamp, sizeof(stamp))) {
       res = enif_snprintf(f, sizeof(f), "%s [%s] [%s] %s",
                           prefix, stamp, TSNAME(), format);
   } else {
       res = enif_snprintf(f, sizeof(f), "%s [%s] %s",
                           prefix, TSNAME(), format);
   }
-#else
-  res = enif_snprintf(f, sizeof(f), "%s [%s] %s",
-                      prefix, TSNAME(), format);
-#endif
   
   if (res > 0) {
       va_start (args, format);
       enif_vfprintf (dbgout, f, args);
       va_end (args);
-      fflush(stdout);
+      fflush(dbgout);
   }
 
   return;
 }
 
-
-#if defined(CLOCK_REALTIME)
-static
-int realtime(struct timespec* tsP)
-{
-    return clock_gettime(CLOCK_REALTIME, tsP);
-}
-
-
-
-
-/*
- * Convert a timespec struct into a readable/printable string
- */
-static
-int timespec2str(char *buf, unsigned int len, struct timespec *ts)
-{
-  int       ret, buflen;
-  struct tm t;
-
-  tzset();
-  if (localtime_r(&(ts->tv_sec), &t) == NULL)
-    return 1;
-
-  ret = strftime(buf, len, "%F %T", &t);
-  if (ret == 0)
-    return 2;
-  len -= ret - 1;
-  buflen = strlen(buf);
-
-  ret = snprintf(&buf[buflen], len, ".%06ld", ts->tv_nsec/1000);
-  if (ret >= len)
-    return 3;
-
-  return 0;
-}
-#endif
diff --git a/erts/emulator/nifs/common/socket_util.c b/erts/emulator/nifs/common/socket_util.c
index 8ad95cb6b7..a61cfc75ef 100644
--- a/erts/emulator/nifs/common/socket_util.c
+++ b/erts/emulator/nifs/common/socket_util.c
@@ -35,6 +35,10 @@
 #include "socket_util.h"
 #include "socket_dbg.h"
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 /* We don't have a "debug flag" to check here, so we 
  * should use the compile debug flag, whatever that is...
  */
@@ -51,12 +55,10 @@
 
 extern char* erl_errno_id(int error); /* THIS IS JUST TEMPORARY??? */
 
-#if defined(CLOCK_REALTIME)
-static int realtime(struct timespec* tsP);
-static int timespec2str(char *buf,
-                        unsigned int len,
-                        struct timespec *ts);
+#if (defined(HAVE_LOCALTIME_R) && defined(HAVE_STRFTIME))
+#define ESOCK_USE_PRETTY_TIMESTAMP 1
 #endif
+    
 
 static char* make_sockaddr_in4(ErlNifEnv*    env,
                                ERL_NIF_TERM  port,
@@ -1510,10 +1512,7 @@ void esock_warning_msg( const char* format, ... )
 {
   va_list         args;
   char            f[512 + sizeof(format)]; // This has to suffice...
-#if defined(CLOCK_REALTIME)
   char            stamp[64]; // Just in case...
-  struct timespec ts;
-#endif
   int             res;
 
   /*
@@ -1525,18 +1524,13 @@ void esock_warning_msg( const char* format, ... )
   // 2018-06-29 12:13:21.232089
   // 29-Jun-2018::13:47:25.097097
 
-#if defined(CLOCK_REALTIME)
-  if (!realtime(&ts) &&
-      (timespec2str(stamp, sizeof(stamp), &ts) == 0)) {
+  if (esock_timestamp(stamp, sizeof(stamp))) {
       res = enif_snprintf(f, sizeof(f),
                           "=WARNING MSG==== %s ===\r\n%s",
                           stamp, format);
   } else {
       res = enif_snprintf(f, sizeof(f), "=WARNING MSG==== %s", format);
   }
-#else
-  res = enif_snprintf(f, sizeof(f), "=WARNING MSG==== %s", format);
-#endif
 
   if (res > 0) {
       va_start (args, format);
@@ -1549,43 +1543,52 @@ void esock_warning_msg( const char* format, ... )
 }
 
 
-#if defined(CLOCK_REALTIME)
-static
-int realtime(struct timespec* tsP)
-{
-  return clock_gettime(CLOCK_REALTIME, tsP);
-}
-
-
-/*
- * Convert a timespec struct into a readable/printable string.
+/* *** esock_timestamp ***
  *
- * "%F::%T"       => 2018-06-29 12:13:21[.232089]
- * "%d-%b-%Y::%T" => 29-Jun-2018::13:47:25.097097
+ * Create a timestamp string.
+ * If awailable, we use the localtime_r and strftime function(s)
+ * to produces a nice readable timestamp. But if not (awailable),
+ * it produces a timestamp in the form of an "Epoch" (A real epoch
+ * is the number of seconds since 1/1 1970, but our timestamp is
+ * the number micro seconds since 1/1 1970).
  */
-static
-int timespec2str(char *buf, unsigned int len, struct timespec *ts)
-{
-  int       ret, buflen;
-  struct tm t;
 
-  tzset();
-  if (localtime_r(&(ts->tv_sec), &t) == NULL)
-    return 1;
+extern
+BOOLEAN_T esock_timestamp(char *buf, unsigned int len)
+{
+    int        ret;
+    ErlNifTime monTime = enif_monotonic_time(ERL_NIF_USEC);
+    ErlNifTime offTime = enif_time_offset(ERL_NIF_USEC);
+    ErlNifTime time    = monTime + offTime;
+#if defined(ESOCK_USE_PRETTY_TIMESTAMP)
+    time_t     sec     = time / 1000000; // (if _MSEC) sec  = time / 1000;
+    time_t     usec    = time % 1000000; // (if _MSEC) msec = time % 1000;
+    int        buflen;
+    struct tm  t;
+
+    if (localtime_r(&sec, &t) == NULL)
+        return FALSE;
 
-  ret = strftime(buf, len, "%d-%B-%Y::%T", &t);
-  if (ret == 0)
-    return 2;
-  len -= ret - 1;
-  buflen = strlen(buf);
+    ret = strftime(buf, len, "%d-%B-%Y::%T", &t);
+    if (ret == 0)
+        return FALSE;
+    len -= ret - 1;
+    buflen = strlen(buf);
 
-  ret = snprintf(&buf[buflen], len, ".%06ld", ts->tv_nsec/1000);
-  if (ret >= len)
-    return 3;
+    ret = enif_snprintf(&buf[buflen], len, ".%06b64d", usec);
+    if (ret >= len)
+        return FALSE;
 
-  return 0;
-}
+    return TRUE;
+#else
+    ret = enif_snprintf(buf, len, "%b64d", time);
+    if (ret == 0)
+        return FALSE;
+    else
+        return TRUE;
 #endif
+}
+
 
 
 /* =================================================================== *
diff --git a/erts/emulator/nifs/common/socket_util.h b/erts/emulator/nifs/common/socket_util.h
index 84b1c8085f..2688a920c4 100644
--- a/erts/emulator/nifs/common/socket_util.h
+++ b/erts/emulator/nifs/common/socket_util.h
@@ -199,6 +199,9 @@ extern
 ERL_NIF_TERM esock_make_error_errno(ErlNifEnv* env, int err);
 
 extern
+BOOLEAN_T esock_timestamp(char *buf, unsigned int len);
+
+extern
 void esock_warning_msg(const char* format, ... );