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

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

perf annotate: Initialize the priv are in symbol__new() 

We need to initializa some fields (right now just a mutex) when we
allocate the per symbol annotation struct, so do it at the symbol
constructor instead of (ab)using the filter mechanism for that.

This way we remove one of the few cases we have for that symbol filter,
which will eventually led to removing it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-cvz34avlz1lez888lob95390@git.kernel.org


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

tools/perf/builtin-annotate.c

+4 −3
Original line number Diff line number Diff line
@@ -204,8 +204,6 @@ static int __cmd_annotate(struct perf_annotate *ann) 
	struct perf_evsel *pos;

	u64 total_nr_samples;



	machines__set_symbol_filter(&session->machines, symbol__annotate_init);



	if (ann->cpu_list) {

		ret = perf_session__cpu_bitmap(session, ann->cpu_list,

					       ann->cpu_bitmap);
@@ -367,7 +365,10 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (annotate.session == NULL)

		return -1;



	symbol_conf.priv_size = sizeof(struct annotation);

	ret = symbol__annotation_init();

	if (ret < 0)

		goto out_delete;



	symbol_conf.try_vmlinux_path = true;



	ret = symbol__init(&annotate.session->header.env);

tools/perf/builtin-report.c

+3 −3
Original line number Diff line number Diff line
@@ -984,9 +984,9 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
	 * implementation.

	 */

	if (ui__has_annotation()) {

		symbol_conf.priv_size = sizeof(struct annotation);

		machines__set_symbol_filter(&session->machines,

					    symbol__annotate_init);

		ret = symbol__annotation_init();

		if (ret < 0)

			goto error;

		/*

 		 * For searching by name on the "Browse map details".

 		 * providing it only in verbose mode not to bloat too

tools/perf/builtin-top.c

+3 −1
Original line number Diff line number Diff line
@@ -1324,7 +1324,9 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (symbol_conf.cumulate_callchain && !callchain_param.order_set)

		callchain_param.order = ORDER_CALLER;



	symbol_conf.priv_size = sizeof(struct annotation);

	status = symbol__annotation_init();

	if (status < 0)

		goto out_delete_evlist;



	symbol_conf.try_vmlinux_path = (symbol_conf.vmlinux_name == NULL);

	if (symbol__init(NULL) < 0)

tools/perf/util/annotate.c

+0 −7
Original line number Diff line number Diff line
@@ -491,13 +491,6 @@ static struct ins *ins__find(const char *name) 
	return bsearch(name, instructions, nmemb, sizeof(struct ins), ins__key_cmp);

}



int symbol__annotate_init(struct map *map __maybe_unused, struct symbol *sym)

{

	struct annotation *notes = symbol__annotation(sym);

	pthread_mutex_init(&notes->lock, NULL);

	return 0;

}



int symbol__alloc_hist(struct symbol *sym)

{

	struct annotation *notes = symbol__annotation(sym);

tools/perf/util/annotate.h

+0 −1
Original line number Diff line number Diff line
@@ -177,7 +177,6 @@ enum symbol_disassemble_errno { 
int symbol__strerror_disassemble(struct symbol *sym, struct map *map,

				 int errnum, char *buf, size_t buflen);



int symbol__annotate_init(struct map *map, struct symbol *sym);

int symbol__annotate_printf(struct symbol *sym, struct map *map,

			    struct perf_evsel *evsel, bool full_paths,

			    int min_pcnt, int max_lines, int context);