iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Reviewed-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-7-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim 2013-09-11 14:09:30 +09:00 committed by Arnaldo Carvalho de Melo
parent 58d91a0068
commit 86c98cab5a
5 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/perf/util/annotate.c
View File

@ -1081,8 +1081,7 @@ static void symbol__free_source_line(struct symbol *sym, int len)
/* Get the filename:line for the colored entries */
static int symbol__get_source_line(struct symbol *sym, struct map *map,
struct perf_evsel *evsel,
struct rb_root *root, int len,
const char *filename)
struct rb_root *root, int len)
{
u64 start;
int i, k;
@ -1131,7 +1130,7 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map,
goto next;
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);
next:
@ -1338,7 +1337,6 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map,
bool full_paths, int min_pcnt, int max_lines)
{
struct dso *dso = map->dso;
const char *filename = dso->long_name;
struct rb_root source_line = RB_ROOT;
u64 len;
@ -1348,9 +1346,8 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map,
len = symbol__size(sym);
if (print_lines) {
symbol__get_source_line(sym, map, evsel, &source_line,
len, filename);
print_summary(&source_line, filename);
symbol__get_source_line(sym, map, evsel, &source_line, len);
print_summary(&source_line, dso->long_name);
}
symbol__annotate_printf(sym, map, evsel, full_paths,

1
tools/perf/util/dso.h
View File

@ -6,6 +6,7 @@
#include <stdbool.h>
#include "types.h"
#include "map.h"
#include "build-id.h"
enum dso_binary_type {
DSO_BINARY_TYPE__KALLSYMS = 0,

2
tools/perf/util/sort.c
View File

@ -259,7 +259,7 @@ static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf,
if (!self->ms.map)
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;
out_path:

4
tools/perf/util/srcline.c
View File

@ -4,6 +4,7 @@
#include <linux/kernel.h>
#include "util/dso.h"
#include "util/util.h"
#include "util/debug.h"
@ -53,11 +54,12 @@ out:
return ret;
}
char *get_srcline(const char *dso_name, unsigned long addr)
char *get_srcline(struct dso *dso, unsigned long addr)
{
char *file;
unsigned line;
char *srcline = SRCLINE_UNKNOWN;
char *dso_name = dso->long_name;
size_t size;
if (dso_name[0] == '[')

4
tools/perf/util/util.h
View File

@ -300,6 +300,8 @@ unsigned long parse_tag_value(const char *str, struct parse_tag *tags);
#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);
#endif /* GIT_COMPAT_UTIL_H */