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>

1 files changed, 9 insertions, 7 deletions

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index db10c0e8ecae..08259184cedb 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -156,14 +156,14 @@ static int process_read_event(event_t *event, struct perf_session *session __use
         return 0;
 }
 
-static int sample_type_check(struct perf_session *session)
+static int perf_session__setup_sample_type(struct perf_session *self)
 {
-        if (!(session->sample_type & PERF_SAMPLE_CALLCHAIN)) {
+        if (!(self->sample_type & PERF_SAMPLE_CALLCHAIN)) {
                 if (sort__has_parent) {
                         fprintf(stderr, "selected --sort parent, but no"
                                         " callchain data. Did you call"
                                         " perf record without -g?\n");
-                        return -1;
+                        return -EINVAL;
                 }
                 if (symbol_conf.use_callchain) {
                         fprintf(stderr, "selected -g but no callchain data."
@@ -176,7 +176,7 @@ static int sample_type_check(struct perf_session *session)
                         if (register_callchain_param(&callchain_param) < 0) {
                                 fprintf(stderr, "Can't register callchain"
                                                 " params\n");
-                                return -1;
+                                return -EINVAL;
                         }
         }
 
@@ -191,13 +191,11 @@ static struct perf_event_ops event_ops = {
         .process_fork_event     = event__process_task,
         .process_lost_event     = event__process_lost,
         .process_read_event     = process_read_event,
-        .sample_type_check      = sample_type_check,
 };
 
-
 static int __cmd_report(void)
 {
-        int ret;
+        int ret = -EINVAL;
         struct perf_session *session;
 
         session = perf_session__new(input_name, O_RDONLY, force);
@@ -207,6 +205,10 @@ static int __cmd_report(void)
         if (show_threads)
                 perf_read_values_init(&show_threads_values);
 
+        ret = perf_session__setup_sample_type(session);
+        if (ret)
+                goto out_delete;
+
         ret = perf_session__process_events(session, &event_ops);
         if (ret)
                 goto out_delete;