pretty-printing cleanup

[lttngtop.git] / src / lttngtop.c

diff --git a/src/lttngtop.c b/src/lttngtop.c
index b024c9a5ed70c33d08dcf34393157b60a2596554..f85d11e1d73653954665458ae0b9b28e6e80c80c 100644 (file)
--- a/src/lttngtop.c
+++ b/src/lttngtop.c
@@ -83,7 +83,7 @@ GPtrArray *available_snapshots;
 sem_t metadata_available;
 int reload_trace = 0;
 
-int last_textdump_print_newline = 1;
+uint64_t prev_ts = 0;
 
 enum {
        OPT_NONE = 0,
@@ -214,9 +214,10 @@ void print_fields(struct bt_ctf_event *event)
 enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_data)
 {
        unsigned long timestamp;
+       uint64_t delta;
        struct tm start;
        uint64_t ts_nsec_start;
-       int pid, cpu_id;
+       int pid, cpu_id, tid;
        const struct bt_definition *scope;
        const char *hostname, *procname;
 
@@ -235,6 +236,8 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
        if (pid == -1ULL && opt_tid) {
                goto error;
        }
+
+       tid = get_context_tid(call_data);
        
        hostname = get_context_hostname(call_data);
        if (opt_tid || opt_hostname) {
@@ -262,18 +265,18 @@ enum bt_cb_ret print_timestamp(struct bt_ctf_event *call_data, void *private_dat
 
        cpu_id = get_cpu_id(call_data);
        procname = get_context_comm(call_data);
-
-       if (hostname) {
-               printf("%02d:%02d:%02d.%09" PRIu64 " (%s) (cpu %d) [%s (%d)] %s (",
-                               start.tm_hour, start.tm_min, start.tm_sec,
-                               ts_nsec_start, hostname, cpu_id, procname, pid,
-                               bt_ctf_event_name(call_data));
-       } else {
-               printf("%02d:%02d:%02d.%09" PRIu64 " (cpu %d) [%s (%d)] %s (",
-                               start.tm_hour, start.tm_min, start.tm_sec,
-                               ts_nsec_start, cpu_id, procname, pid,
-                               bt_ctf_event_name(call_data));
-       }
+       if (prev_ts == 0)
+               prev_ts = timestamp;
+       delta = timestamp - prev_ts;
+       prev_ts = timestamp;
+
+       printf("%02d:%02d:%02d.%09" PRIu64 " (+%" PRIu64 ".%09" PRIu64 ") %s%s"
+                       "(cpu %d) [%s (%d/%d)] %s (",
+                       start.tm_hour, start.tm_min, start.tm_sec,
+                       ts_nsec_start, delta / NSEC_PER_SEC,
+                       delta % NSEC_PER_SEC, (hostname) ? hostname : "",
+                       (hostname) ? " ": "", cpu_id, procname, pid, tid,
+                       bt_ctf_event_name(call_data));
        print_fields(call_data);
        printf(")\n");