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

Commit 96415e4d authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo Committed by Ingo Molnar
Browse files

perf symbols: Avoid unnecessary symbol loading when dso list is specified 



We were performing the full thread__find_addr_location
operation, i.e. resolving to a map/dso _and_ loading its symbols
when we can optimize it by first calling thread__find_addr_map
to find just the map/dso, check if it is one that we are
interested in (passed via --dsos/-d in 'perf annotate', 'perf
report', etc) and if not avoid loading the symtab.

Nice speedup when we know which DSO we're interested in.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1269459619-982-2-git-send-email-acme@infradead.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 53c54019

tools/perf/util/event.c

+23 −15
Original line number Diff line number Diff line
@@ -513,24 +513,32 @@ int event__preprocess_sample(const event_t *self, struct perf_session *session, 


	dump_printf(" ... thread: %s:%d\n", thread->comm, thread->pid);



	thread__find_addr_location(thread, session, cpumode, MAP__FUNCTION,

				   self->ip.ip, al, filter);

	thread__find_addr_map(thread, session, cpumode, MAP__FUNCTION,

			      self->ip.ip, al);

	dump_printf(" ...... dso: %s\n",

		    al->map ? al->map->dso->long_name :

			al->level == 'H' ? "[hypervisor]" : "<not found>");

	/*

	 * We have to do this here as we may have a dso with no symbol hit that

	 * has a name longer than the ones with symbols sampled.

	 */

	if (al->map && !sort_dso.elide && !al->map->dso->slen_calculated)

		dso__calc_col_width(al->map->dso);

	al->sym = NULL;



	if (al->map) {

		if (symbol_conf.dso_list &&

		    (!al->map || !al->map->dso ||

	     !(strlist__has_entry(symbol_conf.dso_list, al->map->dso->short_name) ||

		     !(strlist__has_entry(symbol_conf.dso_list,

					  al->map->dso->short_name) ||

		       (al->map->dso->short_name != al->map->dso->long_name &&

		strlist__has_entry(symbol_conf.dso_list, al->map->dso->long_name)))))

			strlist__has_entry(symbol_conf.dso_list,

					   al->map->dso->long_name)))))

			goto out_filtered;

		/*

		 * We have to do this here as we may have a dso with no symbol

		 * hit that has a name longer than the ones with symbols

		 * sampled.

		 */

		if (!sort_dso.elide && !al->map->dso->slen_calculated)

			dso__calc_col_width(al->map->dso);



		al->sym = map__find_symbol(al->map, al->addr, filter);

	}



	if (symbol_conf.sym_list && al->sym &&

	    !strlist__has_entry(symbol_conf.sym_list, al->sym->name))