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

perf tools: Use kallsyms__is_function() 

Replacing equivalent, the equivalent and longer variation:

	 symbol__is_a(type, MAP__FUNCTION);

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: https://lkml.kernel.org/n/tip-9t3dqogher54owfl9o2mir52@git.kernel.org


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

tools/perf/util/auxtrace.c

+2 −2
Original line number Diff line number Diff line
@@ -1679,7 +1679,7 @@ struct sym_args { 
static bool kern_sym_match(struct sym_args *args, const char *name, char type)

{

	/* A function with the same name, and global or the n'th found or any */

	return symbol_type__is_a(type, MAP__FUNCTION) &&

	return kallsyms__is_function(type) &&

	       !strcmp(name, args->name) &&

	       ((args->global && isupper(type)) ||

		(args->selected && ++(args->cnt) == args->idx) ||
@@ -1784,7 +1784,7 @@ static int find_entire_kern_cb(void *arg, const char *name __maybe_unused, 
{

	struct sym_args *args = arg;



	if (!symbol_type__is_a(type, MAP__FUNCTION))

	if (!kallsyms__is_function(type))

		return 0;



	if (!args->started) {

tools/perf/util/event.c

+1 −1
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ static int find_symbol_cb(void *arg, const char *name, char type, 
	 * Must be a function or at least an alias, as in PARISC64, where "_text" is

	 * an 'A' to the same address as "_stext".

	 */

	if (!(symbol_type__is_a(type, MAP__FUNCTION) ||

	if (!(kallsyms__is_function(type) ||

	      type == 'A') || strcmp(name, args->name))

		return 0;

tools/perf/util/symbol-elf.c

+1 −1
Original line number Diff line number Diff line
@@ -1413,7 +1413,7 @@ static int kcore_copy__process_kallsyms(void *arg, const char *name, char type, 
{

	struct kcore_copy_info *kci = arg;



	if (!symbol_type__is_a(type, MAP__FUNCTION))

	if (!kallsyms__is_function(type))

		return 0;



	if (strchr(name, '[')) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE