tools lib traceevent: Add support for extracting trace_clock in report

If trace-cmd extracts trace_clock, trace-cmd reads trace_clock data from
the trace.dat and switches outputting format of timestamp for each
trace_clock.

Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20130424231305.14877.86147.stgit@yunodevel
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 39 insertions, 11 deletions

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index d1c2a6a4cd32..deedff9d06af 100644
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -305,6 +305,11 @@ int pevent_register_comm(struct pevent *pevent, const char *comm, int pid)
         return 0;
 }
 
+void pevent_register_trace_clock(struct pevent *pevent, char *trace_clock)
+{
+        pevent->trace_clock = trace_clock;
+}
+
 struct func_map {
         unsigned long long              addr;
         char                            *func;
@@ -4443,8 +4448,21 @@ void pevent_event_info(struct trace_seq *s, struct event_format *event,
         trace_seq_terminate(s);
 }
 
+static bool is_timestamp_in_us(char *trace_clock, bool use_trace_clock)
+{
+        if (!use_trace_clock)
+                return true;
+
+        if (!strcmp(trace_clock, "local") || !strcmp(trace_clock, "global")
+            || !strcmp(trace_clock, "uptime") || !strcmp(trace_clock, "perf"))
+                return true;
+
+        /* trace_clock is setting in tsc or counter mode */
+        return false;
+}
+
 void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
-                        struct pevent_record *record)
+                        struct pevent_record *record, bool use_trace_clock)
 {
         static const char *spaces = "                    "; /* 20 spaces */
         struct event_format *event;
@@ -4457,9 +4475,14 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
         int pid;
         int len;
         int p;
+        bool use_usec_format;
 
-        secs = record->ts / NSECS_PER_SEC;
-        nsecs = record->ts - secs * NSECS_PER_SEC;
+        use_usec_format = is_timestamp_in_us(pevent->trace_clock,
+                                                        use_trace_clock);
+        if (use_usec_format) {
+                secs = record->ts / NSECS_PER_SEC;
+                nsecs = record->ts - secs * NSECS_PER_SEC;
+        }
 
         if (record->size < 0) {
                 do_warning("ug! negative record size %d", record->size);
@@ -4484,15 +4507,20 @@ void pevent_print_event(struct pevent *pevent, struct trace_seq *s,
         } else
                 trace_seq_printf(s, "%16s-%-5d [%03d]", comm, pid, record->cpu);
 
-        if (pevent->flags & PEVENT_NSEC_OUTPUT) {
-                usecs = nsecs;
-                p = 9;
-        } else {
-                usecs = (nsecs + 500) / NSECS_PER_USEC;
-                p = 6;
-        }
+        if (use_usec_format) {
+                if (pevent->flags & PEVENT_NSEC_OUTPUT) {
+                        usecs = nsecs;
+                        p = 9;
+                } else {
+                        usecs = (nsecs + 500) / NSECS_PER_USEC;
+                        p = 6;
+                }
 
-        trace_seq_printf(s, " %5lu.%0*lu: %s: ", secs, p, usecs, event->name);
+                trace_seq_printf(s, " %5lu.%0*lu: %s: ",
+                                        secs, p, usecs, event->name);
+        } else
+                trace_seq_printf(s, " %12llu: %s: ",
+                                        record->ts, event->name);
 
         /* Space out the event names evenly. */
         len = strlen(event->name);