perf inject: Mark a dso if it's used

Otherwise they will be not written in an output file.

Signed-off-by: Andrew Vagin <avagin@openvz.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1344344165-369636-5-git-send-email-avagin@openvz.org
[ committer note: Fixed up wrt changes made in the immediate previous patches ]
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 a4a307258fa3a5bd05a81a8ac48c362b958faa65..84ad6abe42586a3bcb6d04aa5696cae6bf59b043 100644 (file)
--- a/tools/perf/builtin-inject.c
+++ b/tools/perf/builtin-inject.c
@@ -14,6 +14,7 @@
 #include "util/session.h"
 #include "util/tool.h"
 #include "util/debug.h"
+#include "util/build-id.h"
 
 #include "util/parse-options.h"
 
@@ -116,6 +117,8 @@ static int perf_event__repipe_sample(struct perf_tool *tool,
                return f(tool, event, sample, evsel, machine);
        }
 
+       build_id__mark_dso_hit(tool, event, sample, evsel, machine);
+
        return perf_event__repipe_synth(tool, event, machine);
 }
 
@@ -310,6 +313,7 @@ found:
        sample_sw.time   = sample->time;
        perf_event__synthesize_sample(event_sw, evsel->attr.sample_type,
                                      &sample_sw, false);
+       build_id__mark_dso_hit(tool, event_sw, &sample_sw, evsel, machine);
        return perf_event__repipe(tool, event_sw, &sample_sw, machine);
 }
 
@@ -342,8 +346,7 @@ static int __cmd_inject(struct perf_inject *inject)
 
        signal(SIGINT, sig_handler);
 
-       if (inject->build_ids) {
-               inject->tool.sample       = perf_event__inject_buildid;
+       if (inject->build_ids || inject->sched_stat) {
                inject->tool.mmap         = perf_event__repipe_mmap;
                inject->tool.fork         = perf_event__repipe_fork;
                inject->tool.tracing_data = perf_event__repipe_tracing_data;
@@ -353,7 +356,9 @@ static int __cmd_inject(struct perf_inject *inject)
        if (session == NULL)
                return -ENOMEM;
 
-       if (inject->sched_stat) {
+       if (inject->build_ids) {
+               inject->tool.sample = perf_event__inject_buildid;
+       } else if (inject->sched_stat) {
                struct perf_evsel *evsel;
 
                inject->tool.ordered_samples = true;

diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
index 6a6399955ef2ddee6b163e0a8e1f2c18dfda250b..94ca117b8d6e1e154545ecb01e69102abe6e7d1d 100644 (file)
--- a/tools/perf/util/build-id.c
+++ b/tools/perf/util/build-id.c
@@ -16,11 +16,11 @@
 #include "session.h"
 #include "tool.h"
 
-static int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,
-                                 union perf_event *event,
-                                 struct perf_sample *sample __maybe_unused,
-                                 struct perf_evsel *evsel __maybe_unused,
-                                 struct machine *machine)
+int build_id__mark_dso_hit(struct perf_tool *tool __maybe_unused,
+                          union perf_event *event,
+                          struct perf_sample *sample __maybe_unused,
+                          struct perf_evsel *evsel __maybe_unused,
+                          struct machine *machine)
 {
        struct addr_location al;
        u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;

diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
index a993ba87d996d78a0a8723ad08f37d2254d82b08..45c500bd5b9fa574bad30e39d7004e61ce165702 100644 (file)
--- a/tools/perf/util/build-id.h
+++ b/tools/perf/util/build-id.h
@@ -7,4 +7,8 @@ extern struct perf_tool build_id__mark_dso_hit_ops;
 
 char *dso__build_id_filename(struct dso *self, char *bf, size_t size);
 
+int build_id__mark_dso_hit(struct perf_tool *tool, union perf_event *event,
+                          struct perf_sample *sample, struct perf_evsel *evsel,
+                          struct machine *machine);
+
 #endif