perf/live: don't synthesize build ids at the end of a live mode trace

It doesn't really make sense to record the build ids at the end of a
live mode session - live mode samples need that information during the
trace rather than at the end.

Leave event__synthesize_build_id() in place, however; we'll still be
using that to synthesize build ids in a more timely fashion in a
future patch.

Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1272696080-16435-2-git-send-email-tzanussi@gmail.com>
Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 83b308a035c2ed6c20f399503e146ced0c93dcb9..1a7379674c291072e6e8368aa3edd2bd3229a310 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -446,13 +446,6 @@ static void atexit_header(void)
 
                process_buildids();
                perf_header__write(&session->header, output, true);
-       } else {
-               int err;
-
-               err = event__synthesize_build_ids(process_synthesized_event,
-                                                 session);
-               if (err < 0)
-                       pr_err("Couldn't synthesize build ids.\n");
        }
 }
 

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 6227dc4cb2cfde74086f935515a180cb72ecc6e3..2d1d97e0746dea6c908e39ccd97d1e1967cd6e97 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -1136,67 +1136,6 @@ int event__synthesize_build_id(struct dso *pos, u16 misc,
        return err;
 }
 
-static int __event_synthesize_build_ids(struct list_head *head, u16 misc,
-                                       event__handler_t process,
-                                       struct machine *machine,
-                                       struct perf_session *session)
-{
-       struct dso *pos;
-
-       dsos__for_each_with_build_id(pos, head) {
-               int err;
-               if (!pos->hit)
-                       continue;
-
-               err = event__synthesize_build_id(pos, misc, process,
-                                                machine, session);
-               if (err < 0)
-                       return err;
-       }
-
-       return 0;
-}
-
-int event__synthesize_build_ids(event__handler_t process,
-                               struct perf_session *session)
-{
-       int err = 0;
-       u16 kmisc, umisc;
-       struct machine *pos;
-       struct rb_node *nd;
-
-       if (!dsos__read_build_ids(&session->header, true))
-               return 0;
-
-       for (nd = rb_first(&session->machines); nd; nd = rb_next(nd)) {
-               pos = rb_entry(nd, struct machine, rb_node);
-               if (machine__is_host(pos)) {
-                       kmisc = PERF_RECORD_MISC_KERNEL;
-                       umisc = PERF_RECORD_MISC_USER;
-               } else {
-                       kmisc = PERF_RECORD_MISC_GUEST_KERNEL;
-                       umisc = PERF_RECORD_MISC_GUEST_USER;
-               }
-
-               err = __event_synthesize_build_ids(&pos->kernel_dsos, kmisc,
-                                                  process, pos, session);
-               if (err == 0)
-                       err = __event_synthesize_build_ids(&pos->user_dsos, umisc,
-                                                          process, pos, session);
-               if (err)
-                       break;
-       }
-
-       if (err < 0) {
-               pr_debug("failed to synthesize build ids\n");
-               return err;
-       }
-
-       dsos__cache_build_ids(&session->header);
-
-       return 0;
-}
-
 int event__process_build_id(event_t *self,
                            struct perf_session *session)
 {

diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index f39443db07069976966ad9f1dbcdc9d193c2d291..402ac2454cf8bcc664c3daf193119f470c77d7c3 100644 (file)
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -122,8 +122,6 @@ int event__synthesize_build_id(struct dso *pos, u16 misc,
                               event__handler_t process,
                               struct machine *machine,
                               struct perf_session *session);
-int event__synthesize_build_ids(event__handler_t process,
-                               struct perf_session *session);
 int event__process_build_id(event_t *self, struct perf_session *session);
 
 #endif /* __PERF_HEADER_H */