Commit 9974f496 authored by Mike Galbraith's avatar Mike Galbraith Committed by Ingo Molnar
Browse files

perf_counter tools: Make symbol loading consistently return number of loaded symbols 



perf_counter tools: Make symbol loading consistently return number of loaded symbols.

Signed-off-by: default avatarMike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1246514758.13293.42.camel@marge.simson.net>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent a92bef0f

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -172,7 +172,7 @@ static int load_kernel(void) 
		return -1;



	err = dso__load_kernel(kernel_dso, vmlinux, NULL, verbose);

	if (err) {

	if (err <= 0) {

		dso__delete(kernel_dso);

		kernel_dso = NULL;

	} else

tools/perf/builtin-report.c

+1 −1
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ static int load_kernel(void) 
		return -1;



	err = dso__load_kernel(kernel_dso, vmlinux, NULL, verbose);

	if (err) {

	if (err <= 0) {

		dso__delete(kernel_dso);

		kernel_dso = NULL;

	} else

tools/perf/builtin-top.c

+1 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ static int parse_symbols(void) 
	if (kernel_dso == NULL)

		return -1;



	if (dso__load_kernel(kernel_dso, NULL, symbol_filter, 1) != 0)

	if (dso__load_kernel(kernel_dso, NULL, symbol_filter, 1) <= 0)

		goto out_delete_dso;



	node = rb_first(&kernel_dso->syms);

tools/perf/util/symbol.c

+6 −3
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ static int dso__load_kallsyms(struct dso *self, symbol_filter_t filter, int verb 
	char *line = NULL;

	size_t n;

	FILE *file = fopen("/proc/kallsyms", "r");

	int count = 0;



	if (file == NULL)

		goto out_failure;
@@ -188,8 +189,10 @@ static int dso__load_kallsyms(struct dso *self, symbol_filter_t filter, int verb 


		if (filter && filter(self, sym))

			symbol__delete(sym, self->sym_priv_size);

		else

		else {

			dso__insert_symbol(self, sym);

			count++;

		}

	}



	/*
@@ -212,7 +215,7 @@ static int dso__load_kallsyms(struct dso *self, symbol_filter_t filter, int verb 
	free(line);

	fclose(file);



	return 0;

	return count;



out_delete_line:

	free(line);
@@ -639,7 +642,7 @@ int dso__load_kernel(struct dso *self, const char *vmlinux, 
	if (vmlinux)

		err = dso__load_vmlinux(self, vmlinux, filter, verbose);



	if (err < 0)

	if (err <= 0)

		err = dso__load_kallsyms(self, filter, verbose);



	return err;