aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/builtin-inject.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-04-13 07:32:28 -0400
committerPatrick McHardy <kaber@trash.net>2011-04-13 07:32:28 -0400
commitb32e3dc7860d00124fa432dba09667e647cb9bcc (patch)
tree2fa6e56f389431dfb84609d3d7572cad76e88e71 /tools/perf/builtin-inject.c
parent6604271c5bc658a6067ed0c3deba4d89e0e50382 (diff)
parent96120d86fe302c006259baee9061eea9e1b9e486 (diff)
Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/kaber/nf-2.6
Diffstat (limited to 'tools/perf/builtin-inject.c')
-rw-r--r--tools/perf/builtin-inject.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/tools/perf/builtin-inject.c b/tools/perf/builtin-inject.c
index e29f04ed3396..8dfc12bb119b 100644
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -43,6 +43,14 @@ static int perf_event__repipe(union perf_event *event,
43 return perf_event__repipe_synth(event, session); 43 return perf_event__repipe_synth(event, session);
44} 44}
45 45
46static int perf_event__repipe_sample(union perf_event *event,
47 struct perf_sample *sample __used,
48 struct perf_evsel *evsel __used,
49 struct perf_session *session)
50{
51 return perf_event__repipe_synth(event, session);
52}
53
46static int perf_event__repipe_mmap(union perf_event *event, 54static int perf_event__repipe_mmap(union perf_event *event,
47 struct perf_sample *sample, 55 struct perf_sample *sample,
48 struct perf_session *session) 56 struct perf_session *session)
@@ -124,6 +132,7 @@ static int dso__inject_build_id(struct dso *self, struct perf_session *session)
124 132
125static int perf_event__inject_buildid(union perf_event *event, 133static int perf_event__inject_buildid(union perf_event *event,
126 struct perf_sample *sample, 134 struct perf_sample *sample,
135 struct perf_evsel *evsel __used,
127 struct perf_session *session) 136 struct perf_session *session)
128{ 137{
129 struct addr_location al; 138 struct addr_location al;
@@ -164,7 +173,7 @@ repipe:
164} 173}
165 174
166struct perf_event_ops inject_ops = { 175struct perf_event_ops inject_ops = {
167 .sample = perf_event__repipe, 176 .sample = perf_event__repipe_sample,
168 .mmap = perf_event__repipe, 177 .mmap = perf_event__repipe,
169 .comm = perf_event__repipe, 178 .comm = perf_event__repipe,
170 .fork = perf_event__repipe, 179 .fork = perf_event__repipe,