Commit 86c98cab authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Pass dso instead of dso_name to get_srcline() 



This is a preparation of next change.  No functional changes are
intended.

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-7-git-send-email-namhyung@kernel.org


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

tools/perf/util/annotate.c

+4 −7
Original line number Original line Diff line number Diff line
@@ -1081,8 +1081,7 @@ static void symbol__free_source_line(struct symbol *sym, int len) 
/* Get the filename:line for the colored entries */

/* Get the filename:line for the colored entries */

static int symbol__get_source_line(struct symbol *sym, struct map *map,

static int symbol__get_source_line(struct symbol *sym, struct map *map,

				   struct perf_evsel *evsel,

				   struct perf_evsel *evsel,

				   struct rb_root *root, int len,

				   struct rb_root *root, int len)

				   const char *filename)

{

{

	u64 start;

	u64 start;

	int i, k;

	int i, k;
@@ -1131,7 +1130,7 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map, 
			goto next;

			goto next;





		offset = start + i;

		offset = start + i;

		src_line->path = get_srcline(filename, offset);

		src_line->path = get_srcline(map->dso, offset);

		insert_source_line(&tmp_root, src_line);

		insert_source_line(&tmp_root, src_line);





	next:

	next:
@@ -1338,7 +1337,6 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, 
			 bool full_paths, int min_pcnt, int max_lines)

			 bool full_paths, int min_pcnt, int max_lines)

{

{

	struct dso *dso = map->dso;

	struct dso *dso = map->dso;

	const char *filename = dso->long_name;

	struct rb_root source_line = RB_ROOT;

	struct rb_root source_line = RB_ROOT;

	u64 len;

	u64 len;
@@ -1348,9 +1346,8 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, 
	len = symbol__size(sym);

	len = symbol__size(sym);





	if (print_lines) {

	if (print_lines) {

		symbol__get_source_line(sym, map, evsel, &source_line,

		symbol__get_source_line(sym, map, evsel, &source_line, len);

					len, filename);

		print_summary(&source_line, dso->long_name);

		print_summary(&source_line, filename);

	}

	}





	symbol__annotate_printf(sym, map, evsel, full_paths,

	symbol__annotate_printf(sym, map, evsel, full_paths,

tools/perf/util/dso.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <stdbool.h>

#include <stdbool.h>

#include "types.h"

#include "types.h"

#include "map.h"

#include "map.h"

#include "build-id.h"





enum dso_binary_type {

enum dso_binary_type {

	DSO_BINARY_TYPE__KALLSYMS = 0,

	DSO_BINARY_TYPE__KALLSYMS = 0,

tools/perf/util/sort.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -259,7 +259,7 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf, 
	if (!self->ms.map)

	if (!self->ms.map)

		goto out_ip;

		goto out_ip;





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

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

	self->srcline = path;

	self->srcline = path;





out_path:

out_path:

tools/perf/util/srcline.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -4,6 +4,7 @@ 




#include <linux/kernel.h>

#include <linux/kernel.h>





#include "util/dso.h"

#include "util/util.h"

#include "util/util.h"

#include "util/debug.h"

#include "util/debug.h"
@@ -53,11 +54,12 @@ static int addr2line(const char *dso_name, unsigned long addr, 
	return ret;

	return ret;

}

}





char *get_srcline(const char *dso_name, unsigned long addr)

char *get_srcline(struct dso *dso, unsigned long addr)

{

{

	char *file;

	char *file;

	unsigned line;

	unsigned line;

	char *srcline = SRCLINE_UNKNOWN;

	char *srcline = SRCLINE_UNKNOWN;

	char *dso_name = dso->long_name;

	size_t size;

	size_t size;





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

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

tools/perf/util/util.h

+3 −1
Original line number Original line Diff line number Diff line
@@ -300,6 +300,8 @@ unsigned long parse_tag_value(const char *str, struct parse_tag *tags); 




#define SRCLINE_UNKNOWN  ((char *) "??:0")

#define SRCLINE_UNKNOWN  ((char *) "??:0")





char *get_srcline(const char *dso_name, unsigned long addr);

struct dso;



char *get_srcline(struct dso *dso, unsigned long addr);

void free_srcline(char *srcline);

void free_srcline(char *srcline);

#endif /* GIT_COMPAT_UTIL_H */
 
#endif /* GIT_COMPAT_UTIL_H */