Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 182373
b: refs/heads/master
c: 88d3d9b
h: refs/heads/master
i:
  182371: 0f126bb
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo authored and Ingo Molnar committed Jan 16, 2010
1 parent ee23c89 commit dae93c8
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 59ee68ecd1561a233fb6ad351980bea8402533e7
refs/heads/master: 88d3d9b7c843a42cb73c55a2d13cd1041da31fb9
35 changes: 34 additions & 1 deletion trunk/tools/perf/builtin-buildid-list.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,15 @@

static char const *input_name = "perf.data";
static int force;
static bool with_hits;

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"),
Expand All @@ -31,6 +33,34 @@ static const struct option options[] = {
OPT_END()
};

static int build_id_list__process_event(event_t *event,
struct perf_session *session)
{
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 (thread == NULL) {
pr_err("problem processing %d event, skipping it.\n",
event->header.type);
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;
Expand All @@ -40,7 +70,10 @@ static int __cmd_buildid_list(void)
if (session == NULL)
return -1;

dsos__fprintf_buildid(stdout);
if (with_hits)
perf_session__process_events(session, &build_id_list__event_ops);

dsos__fprintf_buildid(stdout, with_hits);

perf_session__delete(session);
return err;
Expand Down
11 changes: 7 additions & 4 deletions trunk/tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -1716,22 +1716,25 @@ void dsos__fprintf(FILE *fp)
__dsos__fprintf(&dsos__user, fp);
}

static size_t __dsos__fprintf_buildid(struct list_head *head, FILE *fp)
static size_t __dsos__fprintf_buildid(struct list_head *head, FILE *fp,
bool with_hits)
{
struct dso *pos;
size_t ret = 0;

list_for_each_entry(pos, head, node) {
if (with_hits && !pos->hit)
continue;
ret += dso__fprintf_buildid(pos, fp);
ret += fprintf(fp, " %s\n", pos->long_name);
}
return ret;
}

size_t dsos__fprintf_buildid(FILE *fp)
size_t dsos__fprintf_buildid(FILE *fp, bool with_hits)
{
return (__dsos__fprintf_buildid(&dsos__kernel, fp) +
__dsos__fprintf_buildid(&dsos__user, fp));
return (__dsos__fprintf_buildid(&dsos__kernel, fp, with_hits) +
__dsos__fprintf_buildid(&dsos__user, fp, with_hits));
}

static struct dso *dsos__create_kernel(const char *vmlinux)
Expand Down
3 changes: 2 additions & 1 deletion trunk/tools/perf/util/symbol.h
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ struct dso {
u8 slen_calculated:1;
u8 has_build_id:1;
u8 kernel:1;
u8 hit:1;
unsigned char origin;
u8 sorted_by_name;
u8 loaded;
Expand Down Expand Up @@ -129,7 +130,7 @@ struct perf_session;
int dso__load(struct dso *self, struct map *map, struct perf_session *session,
symbol_filter_t filter);
void dsos__fprintf(FILE *fp);
size_t dsos__fprintf_buildid(FILE *fp);
size_t dsos__fprintf_buildid(FILE *fp, bool with_hits);

size_t dso__fprintf_buildid(struct dso *self, FILE *fp);
size_t dso__fprintf(struct dso *self, enum map_type type, FILE *fp);
Expand Down

0 comments on commit dae93c8

Please sign in to comment.