From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754735AbbBRS1i (ORCPT ); Wed, 18 Feb 2015 13:27:38 -0500 Received: from terminus.zytor.com ([198.137.202.10]:40782 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752460AbbBRS1e (ORCPT ); Wed, 18 Feb 2015 13:27:34 -0500 Date: Wed, 18 Feb 2015 10:26:55 -0800 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: acme@redhat.com, mingo@kernel.org, dzickus@redhat.com, namhyung@kernel.org, eranian@google.com, dsahern@gmail.com, peterz@infradead.org, fweisbec@gmail.com, bp@suse.de, tglx@linutronix.de, adrian.hunter@intel.com, jolsa@redhat.com, efault@gmx.de, rostedt@goodmis.org, hpa@zytor.com, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, acme@redhat.com, namhyung@kernel.org, dzickus@redhat.com, eranian@google.com, dsahern@gmail.com, peterz@infradead.org, fweisbec@gmail.com, bp@suse.de, tglx@linutronix.de, adrian.hunter@intel.com, jolsa@redhat.com, efault@gmx.de, rostedt@goodmis.org, hpa@zytor.com, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Introduce event_format__fprintf method Git-Commit-ID: aa1aac17a15cbf64236bd6f3b855262dcfb845c9 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: aa1aac17a15cbf64236bd6f3b855262dcfb845c9 Gitweb: http://git.kernel.org/tip/aa1aac17a15cbf64236bd6f3b855262dcfb845c9 Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 3 Feb 2015 12:46:58 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 6 Feb 2015 11:46:37 +0100 perf tools: Introduce event_format__fprintf method The existing one, event_format__print() uses stdout unconditionally, and 'perf trace' needs to use it to format into a file that may have been set by the user, i.e. 'trace -o file.output'. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Mike Galbraith Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Stephane Eranian Cc: Steven Rostedt Link: http://lkml.kernel.org/n/tip-7l0mgm91hwg0bby00s5pse8r@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/trace-event-parse.c | 12 +++++++++--- tools/perf/util/trace-event.h | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index c36636f..25d6c73 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -112,8 +112,8 @@ unsigned long long read_size(struct event_format *event, void *ptr, int size) return pevent_read_number(event->pevent, ptr, size); } -void event_format__print(struct event_format *event, - int cpu, void *data, int size) +void event_format__fprintf(struct event_format *event, + int cpu, void *data, int size, FILE *fp) { struct pevent_record record; struct trace_seq s; @@ -125,10 +125,16 @@ void event_format__print(struct event_format *event, trace_seq_init(&s); pevent_event_info(&s, event, &record); - trace_seq_do_printf(&s); + trace_seq_do_fprintf(&s, fp); trace_seq_destroy(&s); } +void event_format__print(struct event_format *event, + int cpu, void *data, int size) +{ + return event_format__fprintf(event, cpu, data, size, stdout); +} + void parse_proc_kallsyms(struct pevent *pevent, char *file, unsigned int size __maybe_unused) { diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h index 52aaa19..356629a 100644 --- a/tools/perf/util/trace-event.h +++ b/tools/perf/util/trace-event.h @@ -23,6 +23,9 @@ trace_event__tp_format(const char *sys, const char *name); int bigendian(void); +void event_format__fprintf(struct event_format *event, + int cpu, void *data, int size, FILE *fp); + void event_format__print(struct event_format *event, int cpu, void *data, int size);