perf buildid-list: Introduce --with-hits option
[linux-2.6.git] / tools / perf / builtin-buildid-list.c
index dcb6143..431f204 100644 (file)
@@ -9,21 +9,22 @@
 #include "builtin.h"
 #include "perf.h"
 #include "util/cache.h"
-#include "util/data_map.h"
 #include "util/debug.h"
-#include "util/header.h"
 #include "util/parse-options.h"
+#include "util/session.h"
 #include "util/symbol.h"
 
 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,79 +33,49 @@ static const struct option options[] = {
        OPT_END()
 };
 
-static int perf_file_section__process_buildids(struct perf_file_section *self,
-                                              int feat, int fd)
+static int build_id_list__process_event(event_t *event,
+                                       struct perf_session *session)
 {
-       if (feat != HEADER_BUILD_ID)
-               return 0;
+       struct addr_location al;
+       u8 cpumode = event->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
+       struct thread *thread = perf_session__findnew(session, event->ip.pid);
 
-       if (lseek(fd, self->offset, SEEK_SET) < 0) {
-               pr_warning("Failed to lseek to %Ld offset for buildids!\n",
-                          self->offset);
+       if (thread == NULL) {
+               pr_err("problem processing %d event, skipping it.\n",
+                       event->header.type);
                return -1;
        }
 
-       if (perf_header__read_build_ids(fd, self->offset, self->size)) {
-               pr_warning("Failed to read buildids!\n");
-               return -1;
-       }
+       thread__find_addr_map(thread, session, cpumode, MAP__FUNCTION,
+                             event->ip.ip, &al);
+
+       if (al.map != NULL)
+               al.map->dso->hit = 1;
 
        return 0;
 }
 
+static struct perf_event_ops build_id_list__event_ops = {
+       .sample = build_id_list__process_event,
+       .mmap   = event__process_mmap,
+       .fork   = event__process_task,
+};
+
 static int __cmd_buildid_list(void)
 {
        int err = -1;
-       struct perf_header *header;
-       struct perf_file_header f_header;
-       struct stat input_stat;
-       int input = open(input_name, O_RDONLY);
-
-       if (input < 0) {
-               pr_err("failed to open file: %s", input_name);
-               if (!strcmp(input_name, "perf.data"))
-                       pr_err("  (try 'perf record' first)");
-               pr_err("\n");
-               goto out;
-       }
-
-       err = fstat(input, &input_stat);
-       if (err < 0) {
-               perror("failed to stat file");
-               goto out_close;
-       }
-
-       if (!force && input_stat.st_uid && (input_stat.st_uid != geteuid())) {
-               pr_err("file %s not owned by current user or root\n",
-                      input_name);
-               goto out_close;
-       }
-
-       if (!input_stat.st_size) {
-               pr_info("zero-sized file, nothing to do!\n");
-               goto out_close;
-       }
-
-       err = -1;
-       header = perf_header__new();
-       if (header == NULL)
-               goto out_close;
+       struct perf_session *session;
 
-       if (perf_file_header__read(&f_header, header, input) < 0) {
-               pr_warning("incompatible file format");
-               goto out_close;
-       }
+       session = perf_session__new(input_name, O_RDONLY, force);
+       if (session == NULL)
+               return -1;
 
-       err = perf_header__process_sections(header, input,
-                                        perf_file_section__process_buildids);
+       if (with_hits)
+               perf_session__process_events(session, &build_id_list__event_ops);
 
-       if (err < 0)
-               goto out_close;
+       dsos__fprintf_buildid(stdout, with_hits);
 
-       dsos__fprintf_buildid(stdout);
-out_close:
-       close(input);
-out:
+       perf_session__delete(session);
        return err;
 }