Merge pull request #199 from bengouss/feature/milliseconds-since-epoch

feat: Add Milliseconds since Epoch option to logger

Author: gigapod

src/core/flux_logging/flxLogger.cpp

@@ -19,6 +19,7 @@
 #include "flxUtils.h"
 #include <string.h>
 #include <time.h>
+#include <sys/time.h>
 
 //----------------------------------------------------------------------------
 // Our time rate/metrics class
@@ -367,6 +368,10 @@ void flxLogger::updateTimeParameterName(void)
         timeTitle = "Time (millis)";
         break;
 
+    case TimeStampEpochMillis:
+        timeTitle = "Time ms (Epoch)";
+        break;
+
     case TimeStampEpoch:
         timeTitle = "Time (Epoch)";
         break;
@@ -424,6 +429,8 @@ std::string flxLogger::get_timestamp(void)
     time_t t_now;
     time(&t_now);
     struct tm *tmLocal = localtime(&t_now);
+    struct timeval tv;
+    gettimeofday(&tv, nullptr);
     switch (_timestampType)
     {
     case TimeStampMillis:
@@ -434,6 +441,10 @@ std::string flxLogger::get_timestamp(void)
         snprintf(szBuffer, sizeof(szBuffer), "%ld", t_now);
         break;
 
+    case TimeStampEpochMillis:
+        snprintf(szBuffer, sizeof(szBuffer), "%ld%03d", tv.tv_sec, tv.tv_usec/1000);
+        break;
+
     case TimeStampDateTimeUSA:
         strftime(szBuffer, sizeof(szBuffer), "%m-%d-%G %T", tmLocal);
         break;

src/core/flux_logging/flxLogger.h

@@ -256,6 +256,7 @@ class flxLogger : public flxActionType<flxLogger>
         TimeStampNone,
         TimeStampMillis,
         TimeStampEpoch,
+        TimeStampEpochMillis,
         TimeStampDateTimeUSA,
         TimeStampDateTime,
         TimeStampISO8601,
@@ -269,6 +270,7 @@ class flxLogger : public flxActionType<flxLogger>
         {{"No Timestamp", TimeStampNone},
          {"Milliseconds since program start", TimeStampMillis},
          {"Seconds since Epoch", TimeStampEpoch},
+         {"Milliseconds since Epoch", TimeStampEpochMillis},
          {"Date Time - USA Date format", TimeStampDateTimeUSA},
          {"Date Time", TimeStampDateTime},
          {"ISO8601 Timestamp", TimeStampISO8601},