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

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

perf symbols: Introduce 'for' method to iterate over the symbols with a given name 

Removing boilerplate from two places, where one would have to find the
first entry, then iterate using symbol__next_by_name + strcmp to see if
the next member had the same name.

Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Link: http://lkml.kernel.org/n/tip-eh73z8gthv20yowirmx2yk38@git.kernel.org


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

tools/perf/util/map.h

+16 −0
Original line number Diff line number Diff line
@@ -116,6 +116,22 @@ struct thread; 
#define map__for_each_symbol(map, pos, n)	\

	dso__for_each_symbol(map->dso, pos, n, map->type)



/* map__for_each_symbol_with_name - iterate over the symbols in the given map

 *                                  that have the given name

 *

 * @map: the 'struct map *' in which symbols itereated

 * @sym_name: the symbol name

 * @pos: the 'struct symbol *' to use as a loop cursor

 * @filter: to use when loading the DSO

 */

#define __map__for_each_symbol_by_name(map, sym_name, pos, filter)	\

	for (pos = map__find_symbol_by_name(map, sym_name, filter);	\

	     pos && strcmp(pos->name, sym_name) == 0;		\

	     pos = symbol__next_by_name(pos))



#define map__for_each_symbol_by_name(map, sym_name, pos)		\

	__map__for_each_symbol_by_name(map, sym_name, (pos), NULL)



typedef int (*symbol_filter_t)(struct map *map, struct symbol *sym);



void map__init(struct map *map, enum map_type type,

tools/perf/util/probe-event.c

+3 −11
Original line number Diff line number Diff line
@@ -2196,14 +2196,11 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, 
static int find_probe_functions(struct map *map, char *name)

{

	int found = 0;

	struct symbol *sym = map__find_symbol_by_name(map, name, NULL);

	struct symbol *sym;



	while (sym != NULL) {

	map__for_each_symbol_by_name(map, name, sym) {

		if (sym->binding == STB_GLOBAL || sym->binding == STB_LOCAL)

			found++;

		sym = symbol__next_by_name(sym);

		if (sym == NULL || strcmp(sym->name, name))

			break;

	}



	return found;
@@ -2275,9 +2272,8 @@ static int find_probe_trace_events_from_map(struct perf_probe_event *pev, 
	}



	ret = 0;

	sym = map__find_symbol_by_name(map, pp->function, NULL);



	while (sym != NULL) {

	map__for_each_symbol_by_name(map, pp->function, sym) {

		tev = (*tevs) + ret;

		tp = &tev->point;

		if (ret == num_matched_functions) {
@@ -2325,10 +2321,6 @@ static int find_probe_trace_events_from_map(struct perf_probe_event *pev, 
					strdup_or_goto(pev->args[i].type,

							nomem_out);

		}



		sym = symbol__next_by_name(sym);

		if (sym == NULL || strcmp(sym->name, pp->function))

			break;

	}



out: