aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-diff.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2011-11-28 05:30:20 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2011-11-28 07:39:28 -0500
commit45694aa7702bc44d538a3bcb51bb2bb96cf190c0 (patch)
tree81bc1f449f55984556d89b63c461dcf181dc97e5 /tools/perf/builtin-diff.c
parent743eb868657bdb1b26c7b24077ca21c67c82c777 (diff)
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>
Diffstat (limited to 'tools/perf/builtin-diff.c')
-rw-r--r--tools/perf/builtin-diff.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 478b0aeb2a62..4f19513d7dda 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -11,6 +11,7 @@
11#include "util/hist.h" 11#include "util/hist.h"
12#include "util/evsel.h" 12#include "util/evsel.h"
13#include "util/session.h" 13#include "util/session.h"
14#include "util/tool.h"
14#include "util/sort.h" 15#include "util/sort.h"
15#include "util/symbol.h" 16#include "util/symbol.h"
16#include "util/util.h" 17#include "util/util.h"
@@ -31,7 +32,7 @@ static int hists__add_entry(struct hists *self,
31 return -ENOMEM; 32 return -ENOMEM;
32} 33}
33 34
34static int diff__process_sample_event(struct perf_event_ops *ops __used, 35static int diff__process_sample_event(struct perf_tool *tool __used,
35 union perf_event *event, 36 union perf_event *event,
36 struct perf_sample *sample, 37 struct perf_sample *sample,
37 struct perf_evsel *evsel __used, 38 struct perf_evsel *evsel __used,
@@ -57,7 +58,7 @@ static int diff__process_sample_event(struct perf_event_ops *ops __used,
57 return 0; 58 return 0;
58} 59}
59 60
60static struct perf_event_ops event_ops = { 61static struct perf_tool perf_diff = {
61 .sample = diff__process_sample_event, 62 .sample = diff__process_sample_event,
62 .mmap = perf_event__process_mmap, 63 .mmap = perf_event__process_mmap,
63 .comm = perf_event__process_comm, 64 .comm = perf_event__process_comm,
@@ -147,13 +148,13 @@ static int __cmd_diff(void)
147 int ret, i; 148 int ret, i;
148 struct perf_session *session[2]; 149 struct perf_session *session[2];
149 150
150 session[0] = perf_session__new(input_old, O_RDONLY, force, false, &event_ops); 151 session[0] = perf_session__new(input_old, O_RDONLY, force, false, &perf_diff);
151 session[1] = perf_session__new(input_new, O_RDONLY, force, false, &event_ops); 152 session[1] = perf_session__new(input_new, O_RDONLY, force, false, &perf_diff);
152 if (session[0] == NULL || session[1] == NULL) 153 if (session[0] == NULL || session[1] == NULL)
153 return -ENOMEM; 154 return -ENOMEM;
154 155
155 for (i = 0; i < 2; ++i) { 156 for (i = 0; i < 2; ++i) {
156 ret = perf_session__process_events(session[i], &event_ops); 157 ret = perf_session__process_events(session[i], &perf_diff);
157 if (ret) 158 if (ret)
158 goto out_delete; 159 goto out_delete;
159 } 160 }