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.
Unified · Split
| @@ -5427,10 +5427,8 @@ void pevent_print_event_time(struct pevent *pevent, struct trace_seq *s, · 5426 unmodified lines | |||
| 5427 | } | 5427 | } |
| 5428 | 5428 | ||
| 5429 | if (pevent->latency_format) { | 5429 | if (pevent->latency_format) { |
| 5430 | trace_seq_printf(s, " %3d", record->cpu); | ||
| 5431 | pevent_data_lat_fmt(pevent, s, record); | 5430 | pevent_data_lat_fmt(pevent, s, record); |
| 5432 | } else | 5431 | } |
| 5433 | trace_seq_printf(s, " [%03d]", record->cpu); | ||
| 5434 | 5432 | ||
| 5435 | if (use_usec_format) { | 5433 | if (use_usec_format) { |
| 5436 | if (pevent->flags & PEVENT_NSEC_OUTPUT) { | 5434 | if (pevent->flags & PEVENT_NSEC_OUTPUT) { |