perf tools: Do not try to call addr2line on non-binary files (58d91a00) · Commits · 戴 / test

No need to call addr2line since they don't have such information. Signed-off-by:

Jiri Olsa <jolsa@redhat.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1378876173-13363-6-git-send-email-namhyung@kernel.org Signed-off-by:

tools/perf/util/sort.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -259,9 +259,6 @@ static int hist_entry__srcline_snprintf(struct hist_entry self, char bf,
		if (!self->ms.map)
		goto out_ip;

		if (!strncmp(self->ms.map->dso->long_name, "/tmp/perf-", 10))
		goto out_ip;

		path = get_srcline(self->ms.map->dso->long_name, self->ip);
		self->srcline = path;

+9 −2

Original line number	Diff line number	Diff line
		@@ -57,11 +57,17 @@ char get_srcline(const char dso_name, unsigned long addr)
		{
		char *file;
		unsigned line;
		char *srcline;
		char *srcline = SRCLINE_UNKNOWN;
		size_t size;

		if (dso_name[0] == '[')
		goto out;

		if (!strncmp(dso_name, "/tmp/perf-", 10))
		goto out;

		if (!addr2line(dso_name, addr, &file, &line))
		return SRCLINE_UNKNOWN;
		goto out;

		/* just calculate actual length */
		size = snprintf(NULL, 0, "%s:%u", file, line) + 1;
		@@ -73,6 +79,7 @@ char get_srcline(const char dso_name, unsigned long addr)
		srcline = SRCLINE_UNKNOWN;

		free(file);
		out:
		return srcline;
		}