perf symbols: Look at .dynsym again if .symtab not found (60e4b10c) · Commits · 戴 / test

The original intent of the code was to repeat the search with want_symtab = 0. But as the code stands now, we never hit the "default" case of the switch statement. Which means we never repeat the search. Tested-by:

Srikar Dronamraju <srikar@linux.vnet.ibm.com> Reported-by:

Arun Sharma <asharma@fb.com> Reported-by:

Srikar Dronamraju <srikar@linux.vnet.ibm.com> Cc: Dave Martin <dave.martin@linaro.org> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@elte.hu> Cc: Mike Galbraith <efault@gmx.de> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Cc: Tom Zanussi <tzanussi@gmail.com> LKML-Reference: <new-submission> Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/util/symbol.c

+13 −12

Original line number	Diff line number	Diff line
		@@ -1486,7 +1486,9 @@ int dso__load(struct dso self, struct map map, symbol_filter_t filter)
		* On the first pass, only load images if they have a full symtab.
		* Failing that, do a second pass where we accept .dynsym also
		*/
		for (self->symtab_type = SYMTAB__BUILD_ID_CACHE, want_symtab = 1;
		want_symtab = 1;
		restart:
		for (self->symtab_type = SYMTAB__BUILD_ID_CACHE;
		self->symtab_type != SYMTAB__NOT_FOUND;
		self->symtab_type++) {
		switch (self->symtab_type) {
		@@ -1536,17 +1538,7 @@ int dso__load(struct dso self, struct map map, symbol_filter_t filter)
		snprintf(name, size, "%s%s", symbol_conf.symfs,
		self->long_name);
		break;

		default:
		/*
		* If we wanted a full symtab but no image had one,
		* relax our requirements and repeat the search.
		*/
		if (want_symtab) {
		want_symtab = 0;
		self->symtab_type = SYMTAB__BUILD_ID_CACHE;
		} else
		continue;
		default:;
		}

		/* Name is now the name of the next image to try */
		@@ -1573,6 +1565,15 @@ int dso__load(struct dso self, struct map map, symbol_filter_t filter)
		}
		}

		/*
		* If we wanted a full symtab but no image had one,
		* relax our requirements and repeat the search.
		*/
		if (ret <= 0 && want_symtab) {
		want_symtab = 0;
		goto restart;
		}

		free(name);
		if (ret < 0 && strstr(self->name, " (deleted)") != NULL)
		return 0;

Admin message