xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf thread: Make thread__find_map() return the map

Browse Source 
It was returning the searched map just on the addr_location passed, with
the function itself returning void.

Make it return the map so that we can make the code more compact.

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-tzlrrzdeoof4i6ktyqv1t6ks@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2018-04-24 11:58:56 -03:00
parent cc5f02f2be
commit 71a84b5aed
11 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1489,8 +1489,8 @@ int perf_event__process(struct perf_tool *tool __maybe_unused,
return machine__process_event(machine, event, sample);
}
void __thread__find_map(struct thread *thread, u8 cpumode, enum map_type type,
u64 addr, struct addr_location *al)
struct map *__thread__find_map(struct thread *thread, u8 cpumode, enum map_type type,
u64 addr, struct addr_location *al)
{
struct map_groups *mg = thread->mg;
struct machine *machine = mg->machine;
@@ -1504,7 +1504,7 @@ void __thread__find_map(struct thread *thread, u8 cpumode, enum map_type type,
if (machine == NULL) {
al->map = NULL;
return;
return NULL;
}
if (cpumode == PERF_RECORD_MISC_KERNEL && perf_host) {
@@ -1532,7 +1532,7 @@ void __thread__find_map(struct thread *thread, u8 cpumode, enum map_type type,
!perf_host)
al->filtered |= (1 << HIST_FILTER__HOST);
return;
return NULL;
}
try_again:
al->map = map_groups__find(mg, type, al->addr);
@@ -1562,14 +1562,15 @@ try_again:
map__load(al->map);
al->addr = al->map->map_ip(al->map, al->addr);
}
return al->map;
}
void __thread__find_symbol(struct thread *thread, u8 cpumode,
enum map_type type, u64 addr,
struct addr_location *al)
{
__thread__find_map(thread, cpumode, type, addr, al);
if (al->map != NULL)
if (__thread__find_map(thread, cpumode, type, addr, al))
al->sym = map__find_symbol(al->map, al->addr);
else
al->sym = NULL;
@@ -1668,8 +1669,7 @@ bool sample_addr_correlates_sym(struct perf_event_attr *attr)
void thread__resolve(struct thread *thread, struct addr_location *al,
struct perf_sample *sample)
{
thread__find_map(thread, sample->cpumode, sample->addr, al);
if (!al->map) {
if (!thread__find_map(thread, sample->cpumode, sample->addr, al)) {
__thread__find_map(thread, sample->cpumode, MAP__VARIABLE,
sample->addr, al);
}