perf tools: Introduce event_format__fprintf method
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: aa1aac17a15cbf64236bd6f3b855262dcfb845c9 Gitweb: http://git.kernel.org/tip/aa1aac17a15cbf64236bd6f3b855262dcfb845c9 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 3 Feb 2015 12:46:58 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> 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 <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Steven Rostedt <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/trace-event-parse.c | 12 +++++++++--- tools/perf/util/trace-event.h | 3 +++ 2 files changed, 12 insertions(+), 3 deletions(-)
tools/perf/util/trace-event-parse.c +9 -3
@@ -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 ) {
tools/perf/util/trace-event.h +3 -0
@@ -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);