Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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 <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/n/tip-7l0mgm91hwg0bby00s5pse8r@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

+12 -3
+9 -3
tools/perf/util/trace-event-parse.c
··· 112 112 return pevent_read_number(event->pevent, ptr, size); 113 113 } 114 114 115 - void event_format__print(struct event_format *event, 116 - int cpu, void *data, int size) 115 + void event_format__fprintf(struct event_format *event, 116 + int cpu, void *data, int size, FILE *fp) 117 117 { 118 118 struct pevent_record record; 119 119 struct trace_seq s; ··· 125 125 126 126 trace_seq_init(&s); 127 127 pevent_event_info(&s, event, &record); 128 - trace_seq_do_printf(&s); 128 + trace_seq_do_fprintf(&s, fp); 129 129 trace_seq_destroy(&s); 130 + } 131 + 132 + void event_format__print(struct event_format *event, 133 + int cpu, void *data, int size) 134 + { 135 + return event_format__fprintf(event, cpu, data, size, stdout); 130 136 } 131 137 132 138 void parse_proc_kallsyms(struct pevent *pevent,
+3
tools/perf/util/trace-event.h
··· 23 23 24 24 int bigendian(void); 25 25 26 + void event_format__fprintf(struct event_format *event, 27 + int cpu, void *data, int size, FILE *fp); 28 + 26 29 void event_format__print(struct event_format *event, 27 30 int cpu, void *data, int size); 28 31