From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755706AbcCXHmi (ORCPT ); Thu, 24 Mar 2016 03:42:38 -0400 Received: from terminus.zytor.com ([198.137.202.10]:43272 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932431AbcCXHmT (ORCPT ); Thu, 24 Mar 2016 03:42:19 -0400 Date: Thu, 24 Mar 2016 00:42:06 -0700 From: tip-bot for Steven Rostedt Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, acme@redhat.com, namhyung@kernel.org, rostedt@goodmis.org Reply-To: rostedt@goodmis.org, namhyung@kernel.org, acme@redhat.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@kernel.org In-Reply-To: <20160323101628.459375d2@gandalf.local.home> References: <20160323101628.459375d2@gandalf.local.home> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] tools lib traceevent: Remove redundant CPU output Git-Commit-ID: 4f3c887688a2b0c01b241afcfedbb4e5e4a8e022 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4f3c887688a2b0c01b241afcfedbb4e5e4a8e022 Gitweb: http://git.kernel.org/tip/4f3c887688a2b0c01b241afcfedbb4e5e4a8e022 Author: Steven Rostedt AuthorDate: Wed, 23 Mar 2016 10:16:28 -0400 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 23 Mar 2016 15:08:12 -0300 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 Cc: Namhyung Kim 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 --- tools/lib/traceevent/event-parse.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 190cc88..a8b6357 100644 --- 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) {