Add time delta to ctf-text

[babeltrace.git] / formats / ctf-text / ctf-text.c

diff --git a/formats/ctf-text/ctf-text.c b/formats/ctf-text/ctf-text.c
index 9b5f98be1a23bd6d90104f836e9ea20977dbb291..b1018c6576f2084fa3fb300225c8b1e72ea98271 100644 (file)
--- a/formats/ctf-text/ctf-text.c
+++ b/formats/ctf-text/ctf-text.c
@@ -34,6 +34,8 @@
 #include <unistd.h>
 #include <stdlib.h>
 
+#define NSEC_PER_SEC 1000000000ULL
+
 int opt_all_field_names,
        opt_scope_field_names,
        opt_header_field_names,
@@ -42,7 +44,9 @@ int opt_all_field_names,
        opt_trace_name,
        opt_trace_domain,
        opt_trace_procname,
-       opt_trace_vpid;
+       opt_trace_vpid,
+       opt_loglevel,
+       opt_delta = 1;
 
 enum field_item {
        ITEM_SCOPE,
@@ -178,12 +182,17 @@ int ctf_text_write_event(struct stream_pos *ppos,
        }
 
        if (stream->has_timestamp) {
+               uint64_t ts_sec, ts_nsec;
+
+               ts_sec = stream->timestamp / NSEC_PER_SEC;
+               ts_nsec = stream->timestamp % NSEC_PER_SEC;
                set_field_names_print(pos, ITEM_HEADER);
                if (pos->print_names)
                        fprintf(pos->fp, "timestamp = ");
                else
                        fprintf(pos->fp, "[");
-               fprintf(pos->fp, "%12" PRIu64, stream->timestamp);
+               fprintf(pos->fp, "%3" PRIu64 ".%09" PRIu64,
+                       ts_sec, ts_nsec);
                if (!pos->print_names)
                        fprintf(pos->fp, "]");
 
@@ -192,6 +201,33 @@ int ctf_text_write_event(struct stream_pos *ppos,
                else
                        fprintf(pos->fp, " ");
        }
+       if (opt_delta && stream->has_timestamp) {
+               uint64_t delta, delta_sec, delta_nsec;
+
+               set_field_names_print(pos, ITEM_HEADER);
+               if (pos->print_names)
+                       fprintf(pos->fp, "delta = ");
+               else
+                       fprintf(pos->fp, "(");
+               if (pos->last_timestamp != -1ULL) {
+                       delta = stream->timestamp - pos->last_timestamp;
+                       delta_sec = delta / NSEC_PER_SEC;
+                       delta_nsec = delta % NSEC_PER_SEC;
+                       fprintf(pos->fp, "+%" PRIu64 ".%09" PRIu64,
+                               delta_sec, delta_nsec);
+               } else {
+                       fprintf(pos->fp, "+?.?????????");
+               }
+               if (!pos->print_names)
+                       fprintf(pos->fp, ")");
+
+               if (pos->print_names)
+                       fprintf(pos->fp, ", ");
+               else
+                       fprintf(pos->fp, " ");
+               pos->last_timestamp = stream->timestamp;
+       }
+
        if ((opt_trace_name || opt_all_field_names) && stream_class->trace->path[0] != '\0') {
                set_field_names_print(pos, ITEM_HEADER);
                if (pos->print_names) {
@@ -244,6 +280,21 @@ int ctf_text_write_event(struct stream_pos *ppos,
                        fprintf(pos->fp, ", ");
                dom_print = 1;
        }
+       if ((opt_loglevel || opt_all_field_names) && event_class->loglevel_identifier != 0) {
+               set_field_names_print(pos, ITEM_HEADER);
+               if (pos->print_names) {
+                       fprintf(pos->fp, "loglevel = ");
+               } else if (dom_print) {
+                       fprintf(pos->fp, ":");
+               }
+
+               fprintf(pos->fp, "%s (%lld)",
+                       g_quark_to_string(event_class->loglevel_identifier),
+                       (long long) event_class->loglevel_value);
+               if (pos->print_names)
+                       fprintf(pos->fp, ", ");
+               dom_print = 1;
+       }
        if (dom_print && !pos->print_names)
                fprintf(pos->fp, " ");
        set_field_names_print(pos, ITEM_HEADER);
@@ -356,6 +407,7 @@ struct trace_descriptor *ctf_text_open_trace(const char *collection_path,
 
        pos = g_new0(struct ctf_text_stream_pos, 1);
 
+       pos->last_timestamp = -1ULL;
        switch (flags & O_ACCMODE) {
        case O_RDWR:
                if (!path)