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

perf hists: Move sort__has_sym into struct perf_hpp_list

Browse Source 
Now we have sort dimensions private for struct hists, we need to make
dimension booleans hists specific as well.

Moving sort__has_sym into struct perf_hpp_list.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1462276488-26683-4-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Jiri Olsa
2016-05-03 13:54:44 +02:00
committed by Arnaldo Carvalho de Melo
parent de7e6a7c8b
commit 2e0453af4e
8 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/util/annotate.c
View File

@@ -1665,5 +1665,5 @@ int hist_entry__annotate(struct hist_entry *he, size_t privsize)
bool ui__has_annotation(void)
{
return use_browser == 1 && sort__has_sym;
return use_browser == 1 && perf_hpp_list.sym;
}

1
tools/perf/util/hist.h
View File

@@ -243,6 +243,7 @@ struct perf_hpp_list {
int need_collapse;
int parent;
int sym;
};
extern struct perf_hpp_list perf_hpp_list;

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

@@ -21,7 +21,6 @@ const char *sort_order;
const char *field_order;
regex_t ignore_callees_regex;
int have_ignore_callees = 0;
int sort__has_sym = 0;
int sort__has_dso = 0;
int sort__has_socket = 0;
int sort__has_thread = 0;
@@ -2245,7 +2244,7 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
}
list->parent = 1;
} else if (sd->entry == &sort_sym) {
sort__has_sym = 1;
list->sym = 1;
/*
* perf diff displays the performance difference amongst
* two or more perf.data files. Those files could come
@@ -2287,7 +2286,7 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
return -EINVAL;
if (sd->entry == &sort_sym_from || sd->entry == &sort_sym_to)
sort__has_sym = 1;
list->sym = 1;
__sort_dimension__add(sd, list, level);
return 0;
@@ -2303,7 +2302,7 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
return -EINVAL;
if (sd->entry == &sort_mem_daddr_sym)
sort__has_sym = 1;
list->sym = 1;
__sort_dimension__add(sd, list, level);
return 0;
@@ -2746,7 +2745,7 @@ void reset_output_field(void)
{
perf_hpp_list.need_collapse = 0;
perf_hpp_list.parent = 0;
sort__has_sym = 0;
perf_hpp_list.sym = 0;
sort__has_dso = 0;
field_order = NULL;

1
tools/perf/util/sort.h
View File

@@ -32,7 +32,6 @@ extern const char default_sort_order[];
extern regex_t ignore_callees_regex;
extern int have_ignore_callees;
extern int sort__has_dso;
extern int sort__has_sym;
extern int sort__has_socket;
extern int sort__has_thread;
extern int sort__has_comm;