Merge branch 'bmk/20190318/temporary_fix_for_realtime_on_darwin'

2 files changed, 51 insertions, 29 deletions

diff --git a/erts/emulator/nifs/common/socket_dbg.c b/erts/emulator/nifs/common/socket_dbg.c
index fe9135e5a0..96f75a328f 100644
--- a/erts/emulator/nifs/common/socket_dbg.c
+++ b/erts/emulator/nifs/common/socket_dbg.c
@@ -38,8 +38,10 @@
 
 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
@@ -71,41 +73,48 @@ 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;
 
   /*
-   * We should really include self in the printout, so we can se which process
-   * are executing the code. But then I must change the API....
-   * ....something for later.
+   * We should really include self in the printout,
+   * so we can se which process are executing the code.
+   * But then I must change the API....something for later.
    */
 
-  if (!realtime(&ts)) {
-    if (timespec2str(stamp, sizeof(stamp), &ts) != 0) {
-        res = enif_snprintf(f, sizeof(f), "%s [%s] %s", prefix, TSNAME(), format);
-        // res = enif_snprintf(f, sizeof(f), "%s [%s]", prefix, format);
-    } else {
-      res = enif_snprintf(f, sizeof(f), "%s [%s] [%s] %s", prefix, stamp, TSNAME(), format);
-      // res = enif_snprintf(f, sizeof(f), "%s [%s] %s", prefix, stamp, format);
-    }
-
-    if (res > 0) {
+#if defined(CLOCK_REALTIME)
+  if (!realtime(&ts) &&
+      (timespec2str(stamp, sizeof(stamp), &ts) == 0)) {
+      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);
-    }
   }
 
   return;
 }
 
 
+#if defined(CLOCK_REALTIME)
 static
 int realtime(struct timespec* tsP)
 {
-  return clock_gettime(CLOCK_REALTIME, tsP);
+    return clock_gettime(CLOCK_REALTIME, tsP);
 }
 
 
@@ -136,3 +145,4 @@ int timespec2str(char *buf, unsigned int len, struct timespec *ts)
 
   return 0;
 }
+#endif
diff --git a/erts/emulator/nifs/common/socket_util.c b/erts/emulator/nifs/common/socket_util.c
index b817ae7636..5e18355308 100644
--- a/erts/emulator/nifs/common/socket_util.c
+++ b/erts/emulator/nifs/common/socket_util.c
@@ -51,8 +51,12 @@
 
 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);
+static int timespec2str(char *buf,
+                        unsigned int len,
+                        struct timespec *ts);
+#endif
 
 static char* make_sockaddr_in4(ErlNifEnv*    env,
                                ERL_NIF_TERM  port,
@@ -1506,39 +1510,46 @@ 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;
 
   /*
-   * We should really include self in the printout, so we can se which process
-   * are executing the code. But then I must change the API....
-   * ....something for later.
+   * We should really include self in the printout,
+   * so we can se which process are executing the code.
+   * But then I must change the API....something for later.
    */
 
   // 2018-06-29 12:13:21.232089
   // 29-Jun-2018::13:47:25.097097
-  
-  if (!realtime(&ts)) {
-    if (timespec2str(stamp, sizeof(stamp), &ts) != 0) {
-        res = enif_snprintf(f, sizeof(f), "=WARNING MSG==== %s", format);
-    } else {
-        res = enif_snprintf(f, sizeof(f),
-                            "=WARNING MSG==== %s ===\r\n%s" , stamp, format);
-    }
 
-    if (res > 0) {
+#if defined(CLOCK_REALTIME)
+  if (!realtime(&ts) &&
+      (timespec2str(stamp, sizeof(stamp), &ts) == 0)) {
+      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);
       enif_vfprintf (stdout, f, args);
       va_end (args);
       fflush(stdout);
-    }
   }
 
   return;
 }
 
 
+#if defined(CLOCK_REALTIME)
 static
 int realtime(struct timespec* tsP)
 {
@@ -1574,6 +1585,7 @@ int timespec2str(char *buf, unsigned int len, struct timespec *ts)
 
   return 0;
 }
+#endif
 
 
 /* =================================================================== *