UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

perf sort: Introduce addr_map_symbol__srcline() to make code more compact 

Since we have 'struct addr_map_symbol' and the srcline sort order keys
all operate on those, make the code more compact by introducing a
function that receives a pointer to such struct and expands the
arguments to map__srcline().

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-j540wq7n3ukkh70gk5be0in5@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:11:47 -03:00
parent e2d88aaa64
commit bfa63519fb
1 changed files with 17 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -365,19 +365,20 @@ struct sort_entry sort_srcline = {
/* --sort srcline_from */ /* --sort srcline_from */
static char *addr_map_symbol__srcline(struct addr_map_symbol *ams)
{
return map__srcline(ams->map, ams->al_addr, ams->sym);
}
static int64_t static int64_t
sort__srcline_from_cmp(struct hist_entry *left, struct hist_entry *right) sort__srcline_from_cmp(struct hist_entry *left, struct hist_entry *right)
{ {
if (!left->branch_info->srcline_from) { if (!left->branch_info->srcline_from)
left->branch_info->srcline_from = map__srcline(left->branch_info->from.map, left->branch_info->srcline_from = addr_map_symbol__srcline(&left->branch_info->from);
left->branch_info->from.al_addr,
left->branch_info->from.sym); if (!right->branch_info->srcline_from)
} right->branch_info->srcline_from = addr_map_symbol__srcline(&right->branch_info->from);
if (!right->branch_info->srcline_from) {
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); return strcmp(right->branch_info->srcline_from, left->branch_info->srcline_from);
} }
@ -399,16 +400,12 @@ struct sort_entry sort_srcline_from = {
static int64_t static int64_t
sort__srcline_to_cmp(struct hist_entry *left, struct hist_entry *right) sort__srcline_to_cmp(struct hist_entry *left, struct hist_entry *right)
{ {
if (!left->branch_info->srcline_to) { if (!left->branch_info->srcline_to)
left->branch_info->srcline_to = map__srcline(left->branch_info->to.map, left->branch_info->srcline_to = addr_map_symbol__srcline(&left->branch_info->to);
left->branch_info->to.al_addr,
left->branch_info->to.sym); if (!right->branch_info->srcline_to)
} right->branch_info->srcline_to = addr_map_symbol__srcline(&right->branch_info->to);
if (!right->branch_info->srcline_to) {
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); return strcmp(right->branch_info->srcline_to, left->branch_info->srcline_to);
} }