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

perf srcline: Introduce map__srcline() to make code more compact

Browse Source 
Replacing a common open coded sequence.

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-2d7d1nzd3ksqornloqeer99r@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo
2018-05-28 11:05:20 -03:00
parent 982d410bc6
commit e2d88aaa64
3 changed files with 22 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -333,13 +333,7 @@ struct sort_entry sort_sym = {
char *hist_entry__get_srcline(struct hist_entry *he)
{
struct map *map = he->ms.map;
if (!map)
return SRCLINE_UNKNOWN;
return get_srcline(map->dso, map__rip_2objdump(map, he->ip),
he->ms.sym, true, true, he->ip);
return map__srcline(he->ms.map, he->ip, he->ms.sym);
}
static int64_t
@@ -375,28 +369,14 @@ static int64_t
sort__srcline_from_cmp(struct hist_entry *left, struct hist_entry *right)
{
if (!left->branch_info->srcline_from) {
struct map *map = left->branch_info->from.map;
if (!map)
left->branch_info->srcline_from = SRCLINE_UNKNOWN;
else
left->branch_info->srcline_from = get_srcline(map->dso,
map__rip_2objdump(map,
left->branch_info->from.al_addr),
left->branch_info->from.sym,
true, true,
left->branch_info->from.al_addr);
left->branch_info->srcline_from = map__srcline(left->branch_info->from.map,
left->branch_info->from.al_addr,
left->branch_info->from.sym);
}
if (!right->branch_info->srcline_from) {
struct map *map = right->branch_info->from.map;
if (!map)
right->branch_info->srcline_from = SRCLINE_UNKNOWN;
else
right->branch_info->srcline_from = get_srcline(map->dso,
map__rip_2objdump(map,
right->branch_info->from.al_addr),
right->branch_info->from.sym,
true, true,
right->branch_info->from.al_addr);
right->branch_info->srcline_from = map__srcline(right->branch_info->from.map,
right->branch_info->from.al_addr,
right->branch_info->from.sym);
}
return strcmp(right->branch_info->srcline_from, left->branch_info->srcline_from);
}
@@ -420,28 +400,14 @@ static int64_t
sort__srcline_to_cmp(struct hist_entry *left, struct hist_entry *right)
{
if (!left->branch_info->srcline_to) {
struct map *map = left->branch_info->to.map;
if (!map)
left->branch_info->srcline_to = SRCLINE_UNKNOWN;
else
left->branch_info->srcline_to = get_srcline(map->dso,
map__rip_2objdump(map,
left->branch_info->to.al_addr),
left->branch_info->from.sym,
true, true,
left->branch_info->to.al_addr);
left->branch_info->srcline_to = map__srcline(left->branch_info->to.map,
left->branch_info->to.al_addr,
left->branch_info->to.sym);
}
if (!right->branch_info->srcline_to) {
struct map *map = right->branch_info->to.map;
if (!map)
right->branch_info->srcline_to = SRCLINE_UNKNOWN;
else
right->branch_info->srcline_to = get_srcline(map->dso,
map__rip_2objdump(map,
right->branch_info->to.al_addr),
right->branch_info->to.sym,
true, true,
right->branch_info->to.al_addr);
right->branch_info->srcline_to = map__srcline(right->branch_info->to.map,
right->branch_info->to.al_addr,
right->branch_info->to.sym);
}
return strcmp(right->branch_info->srcline_to, left->branch_info->srcline_to);
}