redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

perf hists: Move sort__has_parent into struct perf_hpp_list 

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

Moving sort__has_parent 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-3-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
hifive-unleashed-5.1
Jiri Olsa 2016-05-03 13:54:43 +02:00 committed by Arnaldo Carvalho de Melo
parent 52225036fa
commit de7e6a7c8b
6 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/perf/builtin-report.c
View File

@ -234,7 +234,7 @@ static int report__setup_sample_type(struct report *rep)
sample_type |= PERF_SAMPLE_BRANCH_STACK;
if (!is_pipe && !(sample_type & PERF_SAMPLE_CALLCHAIN)) {
if (sort__has_parent) {
if (perf_hpp_list.parent) {
ui__error("Selected --sort parent, but no "
"callchain data. Did you call "
"'perf record' without -g?\n");

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

@ -799,7 +799,7 @@ int sample__resolve_callchain(struct perf_sample *sample,
return 0;
if (symbol_conf.use_callchain || symbol_conf.cumulate_callchain ||
sort__has_parent) {
perf_hpp_list.parent) {
return thread__resolve_callchain(al->thread, cursor, evsel, sample,
parent, al, max_stack);
}

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

@ -242,6 +242,7 @@ struct perf_hpp_list {
struct list_head sorts;
int need_collapse;
int parent;
};
extern struct perf_hpp_list perf_hpp_list;

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

@ -1652,7 +1652,7 @@ static int add_callchain_ip(struct thread *thread,
}
if (al.sym != NULL) {
if (sort__has_parent && !*parent &&
if (perf_hpp_list.parent && !*parent &&
symbol__match_regex(al.sym, &parent_regex))
*parent = al.sym;
else if (have_ignore_callees && root_al &&

5
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_parent = 0;
int sort__has_sym = 0;
int sort__has_dso = 0;
int sort__has_socket = 0;
@ -2244,7 +2243,7 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
pr_err("Invalid regex: %s\n%s", parent_pattern, err);
return -EINVAL;
}
sort__has_parent = 1;
list->parent = 1;
} else if (sd->entry == &sort_sym) {
sort__has_sym = 1;
/*
@ -2746,7 +2745,7 @@ int setup_sorting(struct perf_evlist *evlist)
void reset_output_field(void)
{
perf_hpp_list.need_collapse = 0;
sort__has_parent = 0;
perf_hpp_list.parent = 0;
sort__has_sym = 0;
sort__has_dso = 0;

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_parent;
extern int sort__has_sym;
extern int sort__has_socket;
extern int sort__has_thread;