GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 15:11:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf thread: Make thread__find_symbol() return the symbol searched

Browse source 
Instead of just returning it in al.sym, allowing for some simplification
in its users, and to make it consistent with thread__find_map().

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-4axi2sigslffdixzxbehvgoj@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 12:05:48 -03:00
parent 71a84b5aed
commit d9a5f27460
4 changed files with 12 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tools/perf/builtin-timechart.c
View file

@ -533,11 +533,8 @@ static const char *cat_backtrace(union perf_event *event,
} }
tal.filtered = 0; tal.filtered = 0;
thread__find_symbol(al.thread, cpumode, ip, &tal); if (thread__find_symbol(al.thread, cpumode, ip, &tal))
fprintf(f, "..... %016" PRIx64 " %s\n", ip, tal.sym->name);
if (tal.sym)
fprintf(f, "..... %016" PRIx64 " %s\n", ip,
tal.sym->name);
else else
fprintf(f, "..... %016" PRIx64 "\n", ip); fprintf(f, "..... %016" PRIx64 "\n", ip);
} }

6
tools/perf/util/event.c
View file

@ -1566,14 +1566,14 @@ try_again:
return al->map; return al->map;
} }
void __thread__find_symbol(struct thread *thread, u8 cpumode, struct symbol *__thread__find_symbol(struct thread *thread, u8 cpumode,
enum map_type type, u64 addr, enum map_type type, u64 addr,
struct addr_location *al) struct addr_location *al)
{ {
al->sym = NULL;
if (__thread__find_map(thread, cpumode, type, addr, al)) if (__thread__find_map(thread, cpumode, type, addr, al))
al->sym = map__find_symbol(al->map, al->addr); al->sym = map__find_symbol(al->map, al->addr);
else return al->sym;
al->sym = NULL;
} }
/* /*

4
tools/perf/util/thread.h
View file

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

4
tools/perf/util/unwind-libunwind-local.c
View file

@ -584,11 +584,9 @@ static int entry(u64 ip, struct thread *thread,
struct unwind_entry e; struct unwind_entry e;
struct addr_location al; struct addr_location al;
thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al); e.sym = thread__find_symbol(thread, PERF_RECORD_MISC_USER, ip, &al);
e.ip = al.addr; e.ip = al.addr;
e.map = al.map; e.map = al.map;
e.sym = al.sym;
pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n", pr_debug("unwind: %s:ip = 0x%" PRIx64 " (0x%" PRIx64 ")\n",
al.sym ? al.sym->name : "''", al.sym ? al.sym->name : "''",