Commit 2cc9d0ef authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Save failed result of get_srcline() 



Some dso's lack srcline info, so there's no point to keep trying on
them.  Just save failture status and skip them.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Reviewed-by: default avatarJiri 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-8-git-send-email-namhyung@kernel.org


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

tools/perf/util/dso.c

+1 −0
Original line number Diff line number Diff line
@@ -450,6 +450,7 @@ struct dso *dso__new(const char *name) 
		dso->rel = 0;

		dso->sorted_by_name = 0;

		dso->has_build_id = 0;

		dso->has_srcline = 1;

		dso->kernel = DSO_TYPE_USER;

		dso->needs_swap = DSO_SWAP__UNSET;

		INIT_LIST_HEAD(&dso->node);

tools/perf/util/dso.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ struct dso { 
	enum dso_binary_type	data_type;

	u8		 adjust_symbols:1;

	u8		 has_build_id:1;

	u8		 has_srcline:1;

	u8		 hit:1;

	u8		 annotate_warned:1;

	u8		 sname_alloc:1;

tools/perf/util/srcline.c

+8 −2
Original line number Diff line number Diff line
@@ -58,10 +58,13 @@ char *get_srcline(struct dso *dso, unsigned long addr) 
{

	char *file;

	unsigned line;

	char *srcline = SRCLINE_UNKNOWN;

	char *srcline;

	char *dso_name = dso->long_name;

	size_t size;



	if (!dso->has_srcline)

		return SRCLINE_UNKNOWN;



	if (dso_name[0] == '[')

		goto out;
@@ -81,8 +84,11 @@ char *get_srcline(struct dso *dso, unsigned long addr) 
		srcline = SRCLINE_UNKNOWN;



	free(file);

out:

	return srcline;



out:

	dso->has_srcline = 0;

	return SRCLINE_UNKNOWN;

}



void free_srcline(char *srcline)

CRA Git | Maintained and supported by SUSTech CRA and CCSE