perf tools: Remove perf_tool from event_op3

Now that we keep a perf_tool pointer inside perf_session, there's no need
to have a perf_tool argument in the event_op3 callback. Remove it.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexey Budankov <alexey.budankov@linux.intel.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20180913125450.21342-3-jolsa@kernel.org
[ Fix the builtin-inject.c build for !HAVE_AUXTRACE_SUPPORT ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index d77ed2aea95a0894cda55318d9cb9b6544a4b008..b4a29f435b06ea5c0b3d5a4334fb434341038463 100644 (file)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -131,10 +131,10 @@ static int copy_bytes(struct perf_inject *inject, int fd, off_t size)
        return 0;
 }
 
-static s64 perf_event__repipe_auxtrace(struct perf_tool *tool,
-                                      union perf_event *event,
-                                      struct perf_session *session)
+static s64 perf_event__repipe_auxtrace(struct perf_session *session,
+                                      union perf_event *event)
 {
+       struct perf_tool *tool = session->tool;
        struct perf_inject *inject = container_of(tool, struct perf_inject,
                                                  tool);
        int ret;
@@ -172,9 +172,8 @@ static s64 perf_event__repipe_auxtrace(struct perf_tool *tool,
 #else
 
 static s64
-perf_event__repipe_auxtrace(struct perf_tool *tool __maybe_unused,
-                           union perf_event *event __maybe_unused,
-                           struct perf_session *session __maybe_unused)
+perf_event__repipe_auxtrace(struct perf_session *session __maybe_unused,
+                           union perf_event *event __maybe_unused)
 {
        pr_err("AUX area tracing not supported\n");
        return -EINVAL;

diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c
index 86f0bc445f9386b6b95826d0854b83ede1c0b927..3017b205a157c5f56db23db63ed834ed10a95718 100644 (file)
--- a/tools/perf/util/auxtrace.c
+++ b/tools/perf/util/auxtrace.c
@@ -931,9 +931,8 @@ int perf_event__process_auxtrace_info(struct perf_session *session,
        }
 }
 
-s64 perf_event__process_auxtrace(struct perf_tool *tool,
-                                union perf_event *event,
-                                struct perf_session *session)
+s64 perf_event__process_auxtrace(struct perf_session *session,
+                                union perf_event *event)
 {
        s64 err;
 
@@ -949,7 +948,7 @@ s64 perf_event__process_auxtrace(struct perf_tool *tool,
        if (!session->auxtrace || event->header.type != PERF_RECORD_AUXTRACE)
                return -EINVAL;
 
-       err = session->auxtrace->process_auxtrace_event(session, event, tool);
+       err = session->auxtrace->process_auxtrace_event(session, event, session->tool);
        if (err < 0)
                return err;
 

diff --git a/tools/perf/util/auxtrace.h b/tools/perf/util/auxtrace.h
index 97776470a52ed57dd8b25d15d235f389b082b3d3..6be89776358ccf5bbb6ecb9a281313474d5c7196 100644 (file)
--- a/tools/perf/util/auxtrace.h
+++ b/tools/perf/util/auxtrace.h
@@ -519,9 +519,8 @@ int perf_event__synthesize_auxtrace_info(struct auxtrace_record *itr,
                                         perf_event__handler_t process);
 int perf_event__process_auxtrace_info(struct perf_session *session,
                                      union perf_event *event);
-s64 perf_event__process_auxtrace(struct perf_tool *tool,
-                                union perf_event *event,
-                                struct perf_session *session);
+s64 perf_event__process_auxtrace(struct perf_session *session,
+                                union perf_event *event);
 int perf_event__process_auxtrace_error(struct perf_session *session,
                                       union perf_event *event);
 int itrace_parse_synth_opts(const struct option *opt, const char *str,

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index e781cdba845c0106bf3bcdecd5cd7f3dbeb09059..7d2c8ce6cfadb2f7c22841a671214b5bdc41c08a 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -275,10 +275,8 @@ static int skipn(int fd, off_t n)
        return 0;
 }
 
-static s64 process_event_auxtrace_stub(struct perf_tool *tool __maybe_unused,
-                                      union perf_event *event,
-                                      struct perf_session *session
-                                      __maybe_unused)
+static s64 process_event_auxtrace_stub(struct perf_session *session __maybe_unused,
+                                      union perf_event *event)
 {
        dump_printf(": unhandled!\n");
        if (perf_data__is_pipe(session->data))
@@ -1376,7 +1374,7 @@ static s64 perf_session__process_user_event(struct perf_session *session,
        case PERF_RECORD_AUXTRACE:
                /* setup for reading amidst mmap */
                lseek(fd, file_offset + event->header.size, SEEK_SET);
-               return tool->auxtrace(tool, event, session);
+               return tool->auxtrace(session, event);
        case PERF_RECORD_AUXTRACE_ERROR:
                perf_session__auxtrace_error_inc(session, event);
                return tool->auxtrace_error(session, event);

diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h
index 9c7f78d76275356948a3804e5dc4b82a7fcf58bf..56e4ca54020a24553fe3d8e8cb83e6e06d351970 100644 (file)
--- a/tools/perf/util/tool.h
+++ b/tools/perf/util/tool.h
@@ -27,13 +27,11 @@ typedef int (*event_attr_op)(struct perf_tool *tool,
                             struct perf_evlist **pevlist);
 
 typedef int (*event_op2)(struct perf_session *session, union perf_event *event);
+typedef s64 (*event_op3)(struct perf_session *session, union perf_event *event);
 
 typedef int (*event_oe)(struct perf_tool *tool, union perf_event *event,
                        struct ordered_events *oe);
 
-typedef s64 (*event_op3)(struct perf_tool *tool, union perf_event *event,
-                        struct perf_session *session);
-
 enum show_feature_header {
        SHOW_FEAT_NO_HEADER = 0,
        SHOW_FEAT_HEADER,