Skip to content

Commit fd22759

Browse files
committed
perf probe: Do not use map_load filters for function
It is simpler to just do the loop, no need for globals and the last user of such facility disappears. Testing: # perf probe -F [a-z]*recvmsg aead_recvmsg compat_SyS_recvmsg compat_sys_recvmsg hash_recvmsg inet_recvmsg kernel_recvmsg netlink_recvmsg packet_recvmsg ping_recvmsg raw_recvmsg rawv6_recvmsg rng_recvmsg security_socket_recvmsg selinux_socket_recvmsg skcipher_recvmsg sock_common_recvmsg sock_no_recvmsg sock_recvmsg sys_recvmsg tcp_recvmsg udp_recvmsg udpv6_recvmsg unix_dgram_recvmsg unix_seqpacket_recvmsg unix_stream_recvmsg # Without filters: # perf probe -F | tail -5 zswap_pool_create zswap_pool_current zswap_update_total_size zswap_writeback_entry zswap_zpool_param_set # # perf probe -F | wc -l 33311 # Acked-by: Masami Hiramatsu <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: David Ahern <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Wang Nan <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent b55cc4e commit fd22759

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

tools/perf/util/probe-event.c

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3289,24 +3289,10 @@ int del_perf_probe_events(struct strfilter *filter)
32893289
return ret;
32903290
}
32913291

3292-
/* TODO: don't use a global variable for filter ... */
3293-
static struct strfilter *available_func_filter;
3294-
3295-
/*
3296-
* If a symbol corresponds to a function with global binding and
3297-
* matches filter return 0. For all others return 1.
3298-
*/
3299-
static int filter_available_functions(struct map *map __maybe_unused,
3300-
struct symbol *sym)
3301-
{
3302-
if (strfilter__compare(available_func_filter, sym->name))
3303-
return 0;
3304-
return 1;
3305-
}
3306-
33073292
int show_available_funcs(const char *target, struct strfilter *_filter,
33083293
bool user)
33093294
{
3295+
struct rb_node *nd;
33103296
struct map *map;
33113297
int ret;
33123298

@@ -3324,9 +3310,7 @@ int show_available_funcs(const char *target, struct strfilter *_filter,
33243310
return -EINVAL;
33253311
}
33263312

3327-
/* Load symbols with given filter */
3328-
available_func_filter = _filter;
3329-
ret = map__load(map, filter_available_functions);
3313+
ret = map__load(map, NULL);
33303314
if (ret) {
33313315
if (ret == -2) {
33323316
char *str = strfilter__string(_filter);
@@ -3343,7 +3327,14 @@ int show_available_funcs(const char *target, struct strfilter *_filter,
33433327

33443328
/* Show all (filtered) symbols */
33453329
setup_pager();
3346-
dso__fprintf_symbols_by_name(map->dso, map->type, stdout);
3330+
3331+
for (nd = rb_first(&map->dso->symbol_names[map->type]); nd; nd = rb_next(nd)) {
3332+
struct symbol_name_rb_node *pos = rb_entry(nd, struct symbol_name_rb_node, rb_node);
3333+
3334+
if (strfilter__compare(_filter, pos->sym.name))
3335+
printf("%s\n", pos->sym.name);
3336+
}
3337+
33473338
end:
33483339
if (user) {
33493340
map__put(map);

0 commit comments

Comments
 (0)