From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933879AbcIENVh (ORCPT ); Mon, 5 Sep 2016 09:21:37 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38596 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933426AbcIENV3 (ORCPT ); Mon, 5 Sep 2016 09:21:29 -0400 Date: Mon, 5 Sep 2016 06:21:14 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: mingo@kernel.org, adrian.hunter@intel.com, hpa@zytor.com, tglx@linutronix.de, linux-kernel@vger.kernel.org, mhiramat@kernel.org, namhyung@kernel.org, acme@redhat.com, wangnan0@huawei.com, jolsa@kernel.org, dsahern@gmail.com Reply-To: mingo@kernel.org, adrian.hunter@intel.com, tglx@linutronix.de, hpa@zytor.com, namhyung@kernel.org, mhiramat@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, dsahern@gmail.com, wangnan0@huawei.com, jolsa@kernel.org In-Reply-To: <20160831130427.GA13095@kernel.org> References: <20160831130427.GA13095@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf probe: Do not use map_load filters for function Git-Commit-ID: fd2275984d6e29c6737646ff39dd3de87a03f300 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: fd2275984d6e29c6737646ff39dd3de87a03f300 Gitweb: http://git.kernel.org/tip/fd2275984d6e29c6737646ff39dd3de87a03f300 Author: Arnaldo Carvalho de Melo AuthorDate: Wed, 31 Aug 2016 10:04:27 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Thu, 1 Sep 2016 09:43:57 -0300 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 Cc: Adrian Hunter Cc: David Ahern Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: http://lkml.kernel.org/r/20160831130427.GA13095@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 2873396..0bed2ee 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -3289,24 +3289,10 @@ out: return ret; } -/* TODO: don't use a global variable for filter ... */ -static struct strfilter *available_func_filter; - -/* - * If a symbol corresponds to a function with global binding and - * matches filter return 0. For all others return 1. - */ -static int filter_available_functions(struct map *map __maybe_unused, - struct symbol *sym) -{ - if (strfilter__compare(available_func_filter, sym->name)) - return 0; - return 1; -} - int show_available_funcs(const char *target, struct strfilter *_filter, bool user) { + struct rb_node *nd; struct map *map; int ret; @@ -3324,9 +3310,7 @@ int show_available_funcs(const char *target, struct strfilter *_filter, return -EINVAL; } - /* Load symbols with given filter */ - available_func_filter = _filter; - ret = map__load(map, filter_available_functions); + ret = map__load(map, NULL); if (ret) { if (ret == -2) { char *str = strfilter__string(_filter); @@ -3343,7 +3327,14 @@ int show_available_funcs(const char *target, struct strfilter *_filter, /* Show all (filtered) symbols */ setup_pager(); - dso__fprintf_symbols_by_name(map->dso, map->type, stdout); + + for (nd = rb_first(&map->dso->symbol_names[map->type]); nd; nd = rb_next(nd)) { + struct symbol_name_rb_node *pos = rb_entry(nd, struct symbol_name_rb_node, rb_node); + + if (strfilter__compare(_filter, pos->sym.name)) + printf("%s\n", pos->sym.name); + } + end: if (user) { map__put(map);