openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf thread: Ditch __thread__find_symbol() 

Simulate having all symbols in just one tree by searching the still
existing two trees.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-uss70e8tvzzbzs326330t83q@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2018-04-25 18:16:53 -03:00
parent 128cde3379
commit 117d3c2474
4 changed files with 8 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-trace.c
View File

@ -2036,7 +2036,7 @@ static int trace__pgfault(struct trace *trace,
fprintf(trace->output, "] => ");
__thread__find_symbol(thread, sample->cpumode, MAP__VARIABLE, sample->addr, &al);
thread__find_symbol(thread, sample->cpumode, sample->addr, &al);
if (!al.map) {
thread__find_symbol(thread, sample->cpumode, sample->addr, &al);

8
tools/perf/util/event.c
View File

@ -1565,12 +1565,12 @@ struct map *__thread__find_map(struct thread *thread, u8 cpumode, enum map_type
return al->map;
}
struct symbol *__thread__find_symbol(struct thread *thread, u8 cpumode,
enum map_type type, u64 addr,
struct addr_location *al)
struct symbol *thread__find_symbol(struct thread *thread, u8 cpumode,
u64 addr, struct addr_location *al)
{
al->sym = NULL;
if (__thread__find_map(thread, cpumode, type, addr, al))
if (__thread__find_map(thread, cpumode, MAP__FUNCTION, addr, al) ||
__thread__find_map(thread, cpumode, MAP__VARIABLE, addr, al))
al->sym = map__find_symbol(al->map, al->addr);
return al->sym;
}

10
tools/perf/util/machine.c
View File

@ -1677,15 +1677,7 @@ static void ip__resolve_data(struct thread *thread,
memset(&al, 0, sizeof(al));
__thread__find_symbol(thread, m, MAP__VARIABLE, addr, &al);
if (al.map == NULL) {
/*
* some shared data regions have execute bit set which puts
* their mapping in the MAP__FUNCTION type array.
* Check there as a fallback option before dropping the sample.
*/
thread__find_symbol(thread, m, addr, &al);
}
thread__find_symbol(thread, m, addr, &al);
ams->addr = addr;
ams->al_addr = al.addr;

10
tools/perf/util/thread.h
View File

@ -101,14 +101,8 @@ static inline struct map *thread__find_map(struct thread *thread, u8 cpumode,
return __thread__find_map(thread, cpumode, MAP__FUNCTION, addr, al);
}
struct symbol *__thread__find_symbol(struct thread *thread, u8 cpumode, enum map_type type,
u64 addr, struct addr_location *al);
static inline struct symbol *thread__find_symbol(struct thread *thread, u8 cpumode,
u64 addr, struct addr_location *al)
{
return __thread__find_symbol(thread, cpumode, MAP__FUNCTION, addr, al);
}
struct symbol *thread__find_symbol(struct thread *thread, u8 cpumode,
u64 addr, struct addr_location *al);
void thread__find_cpumode_addr_location(struct thread *thread, u64 addr,
struct addr_location *al);