diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2009-12-27 18:37:02 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-12-28 03:03:34 -0500 |
commit | d549c7690190d9739005e19604faad6da4b802ac (patch) | |
tree | 1a03376ecc41ecd9495298ed3ad34f72da7ecea0 /tools/perf/builtin-timechart.c | |
parent | 27295592c22e71bbd38110c302da8dbb43912a60 (diff) |
perf session: Remove sample_type_check from event_ops
This is really something tools need to do before asking for the
events to be processed, leaving perf_session__process_events to
do just that, process events.
Also add a msg parameter to perf_session__has_traces() so that
the right message can be printed, fixing a regression added by
me in the previous cset (right timechart message) and also
fixing 'perf kmem', that was not asking if 'perf kmem record'
was ran.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1261957026-15580-6-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/builtin-timechart.c')
-rw-r--r-- | tools/perf/builtin-timechart.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c index b42f337c17d9..825283794985 100644 --- a/tools/perf/builtin-timechart.c +++ b/tools/perf/builtin-timechart.c | |||
@@ -1034,17 +1034,19 @@ static struct perf_event_ops event_ops = { | |||
1034 | .process_fork_event = process_fork_event, | 1034 | .process_fork_event = process_fork_event, |
1035 | .process_exit_event = process_exit_event, | 1035 | .process_exit_event = process_exit_event, |
1036 | .process_sample_event = queue_sample_event, | 1036 | .process_sample_event = queue_sample_event, |
1037 | .sample_type_check = perf_session__has_traces, | ||
1038 | }; | 1037 | }; |
1039 | 1038 | ||
1040 | static int __cmd_timechart(void) | 1039 | static int __cmd_timechart(void) |
1041 | { | 1040 | { |
1042 | struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0); | 1041 | struct perf_session *session = perf_session__new(input_name, O_RDONLY, 0); |
1043 | int ret; | 1042 | int ret = -EINVAL; |
1044 | 1043 | ||
1045 | if (session == NULL) | 1044 | if (session == NULL) |
1046 | return -ENOMEM; | 1045 | return -ENOMEM; |
1047 | 1046 | ||
1047 | if (!perf_session__has_traces(session, "timechart record")) | ||
1048 | goto out_delete; | ||
1049 | |||
1048 | ret = perf_session__process_events(session, &event_ops); | 1050 | ret = perf_session__process_events(session, &event_ops); |
1049 | if (ret) | 1051 | if (ret) |
1050 | goto out_delete; | 1052 | goto out_delete; |