[tip:perf/core] perf trace: Add subsystem string to struct event

From: tip-bot for Tom Zanussi
Date: Tue Oct 06 2009 - 09:08:37 EST


Commit-ID: 2774601811bedd04ee7e38624343ea80b4a62d7e
Gitweb: http://git.kernel.org/tip/2774601811bedd04ee7e38624343ea80b4a62d7e
Author: Tom Zanussi <tzanussi@xxxxxxxxx>
AuthorDate: Tue, 6 Oct 2009 01:09:51 -0500
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Tue, 6 Oct 2009 15:04:46 +0200

perf trace: Add subsystem string to struct event

Needed to fully qualify event names for event stream processing.

Signed-off-by: Tom Zanussi <tzanussi@xxxxxxxxx>
Acked-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: rostedt@xxxxxxxxxxx
Cc: lizf@xxxxxxxxxxxxxx
Cc: hch@xxxxxxxxxxxxx
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Mike Galbraith <efault@xxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
LKML-Reference: <1254809398-8078-3-git-send-email-tzanussi@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
tools/perf/util/trace-event-parse.c | 4 +++-
tools/perf/util/trace-event.h | 3 ++-
2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index be8412d..de3fc8b 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -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);
diff --git a/tools/perf/util/trace-event.h b/tools/perf/util/trace-event.h
index 00b440d..cb92978 100644
--- a/tools/perf/util/trace-event.h
+++ b/tools/perf/util/trace-event.h
@@ -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);

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/