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

Commit 27746018 authored by Tom Zanussi's avatar Tom Zanussi Committed by Ingo Molnar
Browse files

perf trace: Add subsystem string to struct event 



Needed to fully qualify event names for event stream processing.

Signed-off-by: default avatarTom Zanussi <tzanussi@gmail.com>
Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: rostedt@goodmis.org
Cc: lizf@cn.fujitsu.com
Cc: hch@infradead.org
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1254809398-8078-3-git-send-email-tzanussi@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 26a50744

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

+3 −1
Original line number Diff line number Diff line
@@ -2950,7 +2950,7 @@ int parse_ftrace_file(char *buf, unsigned long size) 
	return 0;

}



int parse_event_file(char *buf, unsigned long size, char *system__unused __unused)

int parse_event_file(char *buf, unsigned long size, char *sys)

{

	struct event *event;

	int ret;
@@ -2977,6 +2977,8 @@ int parse_event_file(char *buf, unsigned long size, char *system__unused __unuse 
	if (ret < 0)

		die("failed to read event print fmt");



	event->system = strdup(sys);



#define PRINT_ARGS 0

	if (PRINT_ARGS && event->print_fmt.args)

		print_args(event->print_fmt.args);

tools/perf/util/trace-event.h

+2 −1
Original line number Diff line number Diff line
@@ -133,6 +133,7 @@ struct event { 
	int			flags;

	struct format		format;

	struct print_fmt	print_fmt;

	char			*system;

};



enum {
@@ -167,7 +168,7 @@ void print_funcs(void); 
void print_printk(void);



int parse_ftrace_file(char *buf, unsigned long size);

int parse_event_file(char *buf, unsigned long size, char *system);

int parse_event_file(char *buf, unsigned long size, char *sys);

void print_event(int cpu, void *data, int size, unsigned long long nsecs,

		  char *comm);