perf build-id: Move the routine to find DSOs with hits to the lib

[linux-2.6.git] / tools / perf / builtin-buildid-list.c

diff --git a/tools/perf/builtin-buildid-list.c b/tools/perf/builtin-buildid-list.c
index bfd16a1594e4abbcca6d0970eb6bc14571c75c6b..d0675c02f81eb0a45f5d2b8185dc6b26a15f98fd 100644 (file)
--- a/tools/perf/builtin-buildid-list.c
+++ b/tools/perf/builtin-buildid-list.c
@@ -8,8 +8,8 @@
  */
 #include "builtin.h"
 #include "perf.h"
+#include "util/build-id.h"
 #include "util/cache.h"
-#include "util/data_map.h"
 #include "util/debug.h"
 #include "util/parse-options.h"
 #include "util/session.h"
@@ -17,13 +17,15 @@
 
 static char const *input_name = "perf.data";
 static int force;
+static bool with_hits;
 
-static const char *const buildid_list_usage[] = {
+static const char * const buildid_list_usage[] = {
        "perf buildid-list [<options>]",
        NULL
 };
 
 static const struct option options[] = {
+       OPT_BOOLEAN('H', "with-hits", &with_hits, "Show only DSOs with hits"),
        OPT_STRING('i', "input", &input_name, "file",
                    "input file name"),
        OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
@@ -32,38 +34,19 @@ static const struct option options[] = {
        OPT_END()
 };
 
-static int perf_file_section__process_buildids(struct perf_file_section *self,
-                                              int feat, int fd)
-{
-       if (feat != HEADER_BUILD_ID)
-               return 0;
-
-       if (lseek(fd, self->offset, SEEK_SET) < 0) {
-               pr_warning("Failed to lseek to %Ld offset for buildids!\n",
-                          self->offset);
-               return -1;
-       }
-
-       if (perf_header__read_build_ids(fd, self->offset, self->size)) {
-               pr_warning("Failed to read buildids!\n");
-               return -1;
-       }
-
-       return 0;
-}
-
 static int __cmd_buildid_list(void)
 {
        int err = -1;
-       struct perf_session *session = perf_session__new(input_name, O_RDONLY, force);
+       struct perf_session *session;
 
+       session = perf_session__new(input_name, O_RDONLY, force);
        if (session == NULL)
                return -1;
 
-       err = perf_header__process_sections(&session->header, session->fd,
-                                        perf_file_section__process_buildids);
-       if (err >= 0)
-               dsos__fprintf_buildid(stdout);
+       if (with_hits)
+               perf_session__process_events(session, &build_id__mark_dso_hit_ops);
+
+       dsos__fprintf_buildid(stdout, with_hits);
 
        perf_session__delete(session);
        return err;