Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa1aac17 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 402bb4e6

tools/perf/util/trace-event-parse.c

+9 −3
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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);