babeltrace-log: UTC timestamps

[babeltrace.git] / converter / babeltrace-log.c

diff --git a/converter/babeltrace-log.c b/converter/babeltrace-log.c
index 14d46964da1b11d593ef5f02827bc0c1c9c997c1..b6d798f797d0f86094b69c3e507dbf045ebed60f 100644 (file)
--- a/converter/babeltrace-log.c
+++ b/converter/babeltrace-log.c
@@ -46,8 +46,12 @@
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/compat/uuid.h>
+#include <babeltrace/compat/utc.h>
 #include <babeltrace/endian.h>
 
+#define NSEC_PER_USEC 1000UL
+#define NSEC_PER_MSEC 1000000UL
+#define NSEC_PER_SEC 1000000000ULL
 #define USEC_PER_SEC 1000000UL
 
 int babeltrace_debug, babeltrace_verbose;
@@ -171,18 +175,46 @@ void write_event_header(struct ctf_stream_pos *pos, char *line,
                        char **tline, size_t len, size_t *tlen,
                        uint64_t *ts)
 {
-       unsigned long sec, usec;
-
        if (!s_timestamp)
                return;
 
        /* Only need to be executed on first pass (dummy) */
-       if (pos->dummy) {
-               int ret;
+       if (pos->dummy) {
+               int has_timestamp = 0;
+               unsigned long sec, usec, msec;
+               unsigned int year, mon, mday, hour, min;
 
                /* Extract time from input line */
-               ret = sscanf(line, "[%lu.%lu] ", &sec, &usec);
-               if (ret == 2) {
+               if (sscanf(line, "[%lu.%lu] ", &sec, &usec) == 2) {
+                       *ts = (uint64_t) sec * USEC_PER_SEC + (uint64_t) usec;
+                       /*
+                        * Default CTF clock has 1GHz frequency. Convert
+                        * from usec to nsec.
+                        */
+                       *ts *= NSEC_PER_USEC;
+                       has_timestamp = 1;
+               } else if (sscanf(line, "[%u-%u-%u %u:%u:%lu.%lu] ",
+                               &year, &mon, &mday, &hour, &min,
+                               &sec, &msec) == 7) {
+                       time_t ep_sec;
+                       struct tm ti;
+
+                       memset(&ti, 0, sizeof(ti));
+                       ti.tm_year = year - 1900;       /* from 1900 */
+                       ti.tm_mon = mon - 1;            /* 0 to 11 */
+                       ti.tm_mday = mday;
+                       ti.tm_hour = hour;
+                       ti.tm_min = min;
+                       ti.tm_sec = sec;
+
+                       ep_sec = babeltrace_timegm(&ti);
+                       if (ep_sec != (time_t) -1) {
+                               *ts = (uint64_t) ep_sec * NSEC_PER_SEC
+                                       + (uint64_t) msec * NSEC_PER_MSEC;
+                       }
+                       has_timestamp = 1;
+               }
+               if (has_timestamp) {
                        *tline = strchr(line, ']');
                        assert(*tline);
                        (*tline)++;
@@ -190,12 +222,6 @@ void write_event_header(struct ctf_stream_pos *pos, char *line,
                                (*tline)++;
                        }
                        *tlen = len + line - *tline;
-                       *ts = (uint64_t) sec * USEC_PER_SEC + (uint64_t) usec;
-                       /*
-                        * Default CTF clock has 1GHz frequency. Convert
-                        * from usec to nsec.
-                        */
-                       *ts *= 1000;
                }
        }
        /* timestamp */
@@ -289,6 +315,7 @@ void usage(FILE *fp)
        fprintf(fp, "  OUTPUT                         Output trace path\n");
        fprintf(fp, "\n");
        fprintf(fp, "  -t                             With timestamps (format: [sec.usec] string\\n)\n");
+       fprintf(fp, "                                                 (format: [YYYY-MM-DD HH:MM:SS.MS] string\\n)\n");
        fprintf(fp, "\n");
 }