perf symbols: Generalize filter in __fprintf_buildid methods
Commit-ID: 417c2ff6806fd9183cb36682dcf32c4d068aba5e Gitweb: http://git.kernel.org/tip/417c2ff6806fd9183cb36682dcf32c4d068aba5e Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Fri, 7 Dec 2012 09:53:58 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Sun, 9 Dec 2012 08:46:07 -0300
perf symbols: Generalize filter in __fprintf_buildid methods
We had that 'with_hits' filter to show just the build ids for DSOs that had samples, make that generic so that we can use it in the upcoming buildid-cache --missing feature, to show just the build ids that are not in the cache.
Cc David Ahern <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/builtin-buildid-list.c | 7 ++++++- tools/perf/util/dso.c | 4 ++-- tools/perf/util/dso.h | 2 +- tools/perf/util/machine.h | 8 ++++---- tools/perf/util/session.c | 6 +++--- tools/perf/util/session.h | 4 ++-- tools/perf/util/symbol.c | 12 ++++++------ 7 files changed, 24 insertions(+), 19 deletions(-)
tools/perf/builtin-buildid-list.c +6 -1
@@ -44,6 +44,11 @@ static int filename__fprintf_build_id(const char *name, FILE *fp)return fprintf (fp,"%s\n" , sbuild_id); } +static bool dso__skip_buildid (struct dso *dso,int with_hits) +{ +return with_hits && !dso->hit; +} +static int perf_session__list_build_ids (bool force,bool with_hits) {struct perf_session *session;
@@ -66,7 +71,7 @@ static int perf_session__list_build_ids(bool force, bool with_hits)if (with_hits || session->fd_pipe)perf_session__process_events (session, &build_id__mark_dso_hit_ops); -perf_session__fprintf_dsos_buildid (session, stdout, with_hits); +perf_session__fprintf_dsos_buildid (session, stdout, dso__skip_buildid, with_hits);perf_session__delete (session); out:return 0 ;
tools/perf/util/dso.c +2 -2
@@ -539,13 +539,13 @@ struct dso *__dsos__findnew(struct list_head *head, const char *name) }size_t __dsos__fprintf_buildid (struct list_head *head,FILE *fp, -bool with_hits) +bool (skip )(struct dso *dso,int parm),int parm) {struct dso *pos;size_t ret =0 ;list_for_each_entry (pos, head, node) { -if (with_hits && !pos->hit) +if (skip &&skip (pos, parm))continue ; ret +=dso__fprintf_buildid (pos, fp); ret +=fprintf (fp," %s\n" , pos->long_name);
tools/perf/util/dso.h +1 -1
@@ -138,7 +138,7 @@ struct dso *__dsos__findnew(struct list_head *head, const char *name);bool __dsos__read_build_ids (struct list_head *head,bool with_hits);size_t __dsos__fprintf_buildid (struct list_head *head,FILE *fp, -bool with_hits); +bool (skip )(struct dso *dso,int parm),int parm);size_t __dsos__fprintf (struct list_head *head,FILE *fp);size_t dso__fprintf_buildid (struct dso *dso,FILE *fp);
tools/perf/util/machine.h +4 -4
@@ -129,11 +129,11 @@ int machine__load_kallsyms(struct machine *machine, const char *filename,int machine__load_vmlinux_path (struct machine *machine,enum map_type type,symbol_filter_t filter); -size_t machine__fprintf_dsos_buildid (struct machine *machine, -FILE *fp,bool with_hits); +size_t machine__fprintf_dsos_buildid (struct machine *machine,FILE *fp, +bool (skip )(struct dso *dso,int parm),int parm);size_t machines__fprintf_dsos (struct rb_root *machines,FILE *fp); -size_t machines__fprintf_dsos_buildid (struct rb_root *machines, -FILE *fp,bool with_hits); +size_t machines__fprintf_dsos_buildid (struct rb_root *machines,FILE *fp, +bool (skip )(struct dso *dso,int parm),int parm);void machine__destroy_kernel_maps (struct machine *machine);int __machine__create_kernel_maps (struct machine *machine,struct dso *kernel);
tools/perf/util/session.c +3 -3
@@ -1552,10 +1552,10 @@ size_t perf_session__fprintf_dsos(struct perf_session *self, FILE *fp) }size_t perf_session__fprintf_dsos_buildid (struct perf_session *self,FILE *fp, -bool with_hits) +bool (skip )(struct dso *dso,int parm),int parm) { -size_t ret =machine__fprintf_dsos_buildid (&self->host_machine, fp, with_hits); -return ret +machines__fprintf_dsos_buildid (&self->machines, fp, with_hits); +size_t ret =machine__fprintf_dsos_buildid (&self->host_machine, fp, skip, parm); +return ret +machines__fprintf_dsos_buildid (&self->machines, fp, skip, parm); }size_t perf_session__fprintf_nr_events (struct perf_session *session,FILE *fp)
tools/perf/util/session.h +2 -2
@@ -115,8 +115,8 @@ size_t perf_session__fprintf(struct perf_session *self, FILE *fp);size_t perf_session__fprintf_dsos (struct perf_session *self,FILE *fp); -size_t perf_session__fprintf_dsos_buildid (struct perf_session *self, -FILE *fp,bool with_hits); +size_t perf_session__fprintf_dsos_buildid (struct perf_session *session,FILE *fp, +bool (fn )(struct dso *dso,int parm),int parm);size_t perf_session__fprintf_nr_events (struct perf_session *session,FILE *fp);
tools/perf/util/symbol.c +6 -6
@@ -1315,21 +1315,21 @@ size_t machines__fprintf_dsos(struct rb_root *machines, FILE *fp) }size_t machine__fprintf_dsos_buildid (struct machine *machine,FILE *fp, -bool with_hits) +bool (skip )(struct dso *dso,int parm),int parm) { -return __dsos__fprintf_buildid (&machine->kernel_dsos, fp, with_hits) + -__dsos__fprintf_buildid (&machine->user_dsos, fp, with_hits); +return __dsos__fprintf_buildid (&machine->kernel_dsos, fp, skip, parm) + +__dsos__fprintf_buildid (&machine->user_dsos, fp, skip, parm); } -size_t machines__fprintf_dsos_buildid (struct rb_root *machines, -FILE *fp,bool with_hits) +size_t machines__fprintf_dsos_buildid (struct rb_root *machines,FILE *fp, +bool (skip )(struct dso *dso,int parm),int parm) {struct rb_node *nd;size_t ret =0 ;for (nd =rb_first (machines); nd; nd =rb_next (nd)) { struct machine *pos = rb_entry(nd, struct machine, rb_node); - ret +=machine__fprintf_dsos_buildid (pos, fp, with_hits); + ret +=machine__fprintf_dsos_buildid (pos, fp, skip, parm); }return ret; }