babeltrace-log: UTC timestamps

Signed-off-by: Soumya Kanti Chakraborty <soumya.kanti.chakraborty@ericsson.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

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");
 }
 

diff --git a/include/Makefile.am b/include/Makefile.am
index eee2ac1048869435c326057966bfe6fcdf51e790..7bf253912b612d56a92bd8e01c92d1e05c7d2da3 100644 (file)
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -33,5 +33,6 @@ noinst_HEADERS = \
        babeltrace/trace-handle-internal.h \
        babeltrace/compat/uuid.h \
        babeltrace/compat/memstream.h \
+       babeltrace/compat/utc.h \
        babeltrace/endian.h \
        babeltrace/mmap-align.h

diff --git a/include/babeltrace/compat/utc.h b/include/babeltrace/compat/utc.h
new file mode 100644 (file)
index 0000000..d59d856
--- /dev/null
+++ b/include/babeltrace/compat/utc.h
@@ -0,0 +1,86 @@
+#ifndef _BABELTRACE_UTC_H
+#define _BABELTRACE_UTC_H
+
+/*
+ * Copyright (C) 2011-2013 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+#include <time.h>
+
+/* If set, use GNU or BSD timegm(3) */
+#if defined(_BSD_SOURCE) || defined(_SVID_SOURCE)
+
+static inline
+time_t babeltrace_timegm(struct tm *tm)
+{
+       return timegm(tm);
+}
+
+#else
+
+#include <string.h>
+#include <stdlib.h>
+
+/*
+ * Note: Below implementation of timegm() is not thread safe
+ * as it changes the environment
+ * variable TZ. It is OK as long as it is kept in self-contained program,
+ * but should not be used within thread-safe library code.
+ */
+
+static inline
+time_t babeltrace_timegm(struct tm *tm)
+{
+       time_t ret;
+       char *tz;
+
+       tz = getenv("TZ");
+       /*
+        * Make a temporary copy, as the environment variable will be
+        * modified.
+        */
+       if (tz) {
+               tz = strdup(tz);
+               if (!tz) {
+                       /*
+                        * Memory allocation error.
+                        */
+                       return (time_t) -1;
+               }
+       }
+
+       /* Temporarily setting TZ to 1 for UTC */
+       setenv("TZ", "", 1);
+       tzset();
+       ret = mktime(tm);
+       if (tz) {
+               setenv("TZ", tz, 1);
+               free(tz);
+       } else {
+               unsetenv("TZ");
+       }
+       tzset();
+       return ret;
+}
+
+#endif
+
+#endif /* _BABELTRACE_UTC_H */