perf tools: Rename perf_event_ops to perf_tool

To better reflect that it became the base class for all tools, that must
be in each tool struct and where common stuff will be put.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-qgpc4msetqlwr8y2k7537cxe@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 28 insertions, 27 deletions

diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index a5bcf81776fc..09c106193e65 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -9,6 +9,7 @@
 
 #include "perf.h"
 #include "util/session.h"
+#include "util/tool.h"
 #include "util/debug.h"
 
 #include "util/parse-options.h"
@@ -16,7 +17,7 @@
 static char             const *input_name = "-";
 static bool             inject_build_ids;
 
-static int perf_event__repipe_synth(struct perf_event_ops *ops __used,
+static int perf_event__repipe_synth(struct perf_tool *tool __used,
                                     union perf_event *event,
                                     struct machine *machine __used)
 {
@@ -37,17 +38,17 @@ static int perf_event__repipe_synth(struct perf_event_ops *ops __used,
         return 0;
 }
 
-static int perf_event__repipe_op2_synth(struct perf_event_ops *ops,
+static int perf_event__repipe_op2_synth(struct perf_tool *tool,
                                         union perf_event *event,
                                         struct perf_session *session __used)
 {
-        return perf_event__repipe_synth(ops, event, NULL);
+        return perf_event__repipe_synth(tool, event, NULL);
 }
 
-static int perf_event__repipe_event_type_synth(struct perf_event_ops *ops,
+static int perf_event__repipe_event_type_synth(struct perf_tool *tool,
                                                union perf_event *event)
 {
-        return perf_event__repipe_synth(ops, event, NULL);
+        return perf_event__repipe_synth(tool, event, NULL);
 }
 
 static int perf_event__repipe_tracing_data_synth(union perf_event *event,
@@ -62,45 +63,45 @@ static int perf_event__repipe_attr(union perf_event *event,
         return perf_event__repipe_synth(NULL, event, NULL);
 }
 
-static int perf_event__repipe(struct perf_event_ops *ops,
+static int perf_event__repipe(struct perf_tool *tool,
                               union perf_event *event,
                               struct perf_sample *sample __used,
                               struct machine *machine)
 {
-        return perf_event__repipe_synth(ops, event, machine);
+        return perf_event__repipe_synth(tool, event, machine);
 }
 
-static int perf_event__repipe_sample(struct perf_event_ops *ops,
+static int perf_event__repipe_sample(struct perf_tool *tool,
                                      union perf_event *event,
                               struct perf_sample *sample __used,
                               struct perf_evsel *evsel __used,
                               struct machine *machine)
 {
-        return perf_event__repipe_synth(ops, event, machine);
+        return perf_event__repipe_synth(tool, event, machine);
 }
 
-static int perf_event__repipe_mmap(struct perf_event_ops *ops,
+static int perf_event__repipe_mmap(struct perf_tool *tool,
                                    union perf_event *event,
                                    struct perf_sample *sample,
                                    struct machine *machine)
 {
         int err;
 
-        err = perf_event__process_mmap(ops, event, sample, machine);
-        perf_event__repipe(ops, event, sample, machine);
+        err = perf_event__process_mmap(tool, event, sample, machine);
+        perf_event__repipe(tool, event, sample, machine);
 
         return err;
 }
 
-static int perf_event__repipe_task(struct perf_event_ops *ops,
+static int perf_event__repipe_task(struct perf_tool *tool,
                                    union perf_event *event,
                                    struct perf_sample *sample,
                                    struct machine *machine)
 {
         int err;
 
-        err = perf_event__process_task(ops, event, sample, machine);
-        perf_event__repipe(ops, event, sample, machine);
+        err = perf_event__process_task(tool, event, sample, machine);
+        perf_event__repipe(tool, event, sample, machine);
 
         return err;
 }
@@ -130,7 +131,7 @@ static int dso__read_build_id(struct dso *self)
         return -1;
 }
 
-static int dso__inject_build_id(struct dso *self, struct perf_event_ops *ops,
+static int dso__inject_build_id(struct dso *self, struct perf_tool *tool,
                                 struct machine *machine)
 {
         u16 misc = PERF_RECORD_MISC_USER;
@@ -144,7 +145,7 @@ static int dso__inject_build_id(struct dso *self, struct perf_event_ops *ops,
         if (self->kernel)
                 misc = PERF_RECORD_MISC_KERNEL;
 
-        err = perf_event__synthesize_build_id(ops, self, misc, perf_event__repipe,
+        err = perf_event__synthesize_build_id(tool, self, misc, perf_event__repipe,
                                               machine);
         if (err) {
                 pr_err("Can't synthesize build_id event for %s\n", self->long_name);
@@ -154,7 +155,7 @@ static int dso__inject_build_id(struct dso *self, struct perf_event_ops *ops,
         return 0;
 }
 
-static int perf_event__inject_buildid(struct perf_event_ops *ops,
+static int perf_event__inject_buildid(struct perf_tool *tool,
                                       union perf_event *event,
                                       struct perf_sample *sample,
                                       struct perf_evsel *evsel __used,
@@ -180,7 +181,7 @@ static int perf_event__inject_buildid(struct perf_event_ops *ops,
                 if (!al.map->dso->hit) {
                         al.map->dso->hit = 1;
                         if (map__load(al.map, NULL) >= 0) {
-                                dso__inject_build_id(al.map->dso, ops, machine);
+                                dso__inject_build_id(al.map->dso, tool, machine);
                                 /*
                                  * If this fails, too bad, let the other side
                                  * account this as unresolved.
@@ -193,11 +194,11 @@ static int perf_event__inject_buildid(struct perf_event_ops *ops,
         }
 
 repipe:
-        perf_event__repipe(ops, event, sample, machine);
+        perf_event__repipe(tool, event, sample, machine);
         return 0;
 }
 
-struct perf_event_ops inject_ops = {
+struct perf_tool perf_inject = {
         .sample         = perf_event__repipe_sample,
         .mmap           = perf_event__repipe,
         .comm           = perf_event__repipe,
@@ -228,17 +229,17 @@ static int __cmd_inject(void)
         signal(SIGINT, sig_handler);
 
         if (inject_build_ids) {
-                inject_ops.sample       = perf_event__inject_buildid;
-                inject_ops.mmap         = perf_event__repipe_mmap;
-                inject_ops.fork         = perf_event__repipe_task;
-                inject_ops.tracing_data = perf_event__repipe_tracing_data;
+                perf_inject.sample       = perf_event__inject_buildid;
+                perf_inject.mmap         = perf_event__repipe_mmap;
+                perf_inject.fork         = perf_event__repipe_task;
+                perf_inject.tracing_data = perf_event__repipe_tracing_data;
         }
 
-        session = perf_session__new(input_name, O_RDONLY, false, true, &inject_ops);
+        session = perf_session__new(input_name, O_RDONLY, false, true, &perf_inject);
         if (session == NULL)
                 return -ENOMEM;
 
-        ret = perf_session__process_events(session, &inject_ops);
+        ret = perf_session__process_events(session, &perf_inject);
 
         perf_session__delete(session);