tools lib traceevent: Remove redundant CPU output

Commit a6745330789f ("tools lib traceevent: Split pevent_print_event()
into specific functionality functions") broke apart the function
pevent_print_event() into three functions.

The first function prints the comm, pid and CPU, the second prints the
timestamp.

But that commit added the printing of the CPU in the timestamp function,
which now causes pevent_print_event() to duplicate the CPU output.

Remove the redundant printing of the record's CPU from the timestamp
function.

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Fixes: a6745330789f ("tools lib traceevent: Split pevent_print_event() into specific functionality functions")
Link: http://lkml.kernel.org/r/20160323101628.459375d2@gandalf.local.home
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c
index 190cc886ab9105ea6be58ad58caf8e940274c4a9..a8b6357d1ffef8678d82b0ae357b445b9ba2cf71 100644 (file)
--- a/tools/lib/traceevent/event-parse.c
+++ b/tools/lib/traceevent/event-parse.c
@@ -5427,10 +5427,8 @@ void pevent_print_event_time(struct pevent *pevent, struct trace_seq *s,
        }
 
        if (pevent->latency_format) {
-               trace_seq_printf(s, " %3d", record->cpu);
                pevent_data_lat_fmt(pevent, s, record);
-       } else
-               trace_seq_printf(s, " [%03d]", record->cpu);
+       }
 
        if (use_usec_format) {
                if (pevent->flags & PEVENT_NSEC_OUTPUT) {