Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 417c2ff6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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 <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-9nfesdfpnx7zp96yn3tmfbx0@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent db6d0bb8

tools/perf/builtin-buildid-list.c

+6 −1
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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)