Commit 2774601811bedd04ee7e38624343ea80b4a62d7e

Authored by Tom Zanussi
Committed by Ingo Molnar
1 parent 26a50744b2

perf trace: Add subsystem string to struct event

Needed to fully qualify event names for event stream processing.

Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Acked-by: Frederic 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: Ingo Molnar <mingo@elte.hu>

Showing 2 changed files with 5 additions and 2 deletions Side-by-side Diff

tools/perf/util/trace-event-parse.c
... ... @@ -2950,7 +2950,7 @@
2950 2950 return 0;
2951 2951 }
2952 2952  
2953   -int parse_event_file(char *buf, unsigned long size, char *system__unused __unused)
  2953 +int parse_event_file(char *buf, unsigned long size, char *sys)
2954 2954 {
2955 2955 struct event *event;
2956 2956 int ret;
... ... @@ -2976,6 +2976,8 @@
2976 2976 ret = event_read_print(event);
2977 2977 if (ret < 0)
2978 2978 die("failed to read event print fmt");
  2979 +
  2980 + event->system = strdup(sys);
2979 2981  
2980 2982 #define PRINT_ARGS 0
2981 2983 if (PRINT_ARGS && event->print_fmt.args)
tools/perf/util/trace-event.h
... ... @@ -133,6 +133,7 @@
133 133 int flags;
134 134 struct format format;
135 135 struct print_fmt print_fmt;
  136 + char *system;
136 137 };
137 138  
138 139 enum {
... ... @@ -167,7 +168,7 @@
167 168 void print_printk(void);
168 169  
169 170 int parse_ftrace_file(char *buf, unsigned long size);
170   -int parse_event_file(char *buf, unsigned long size, char *system);
  171 +int parse_event_file(char *buf, unsigned long size, char *sys);
171 172 void print_event(int cpu, void *data, int size, unsigned long long nsecs,
172 173 char *comm);
173 174