Commit 52225036 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo

perf hists: Move sort__need_collapse 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__need_collapse into struct perf_hpp_list.

Adding hists__has macro to easily access this info perf struct hists
object.
Signed-off-by: default avatarJiri 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-2-git-send-email-jolsa@kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4679bcca
...@@ -428,7 +428,7 @@ static void hists__baseline_only(struct hists *hists) ...@@ -428,7 +428,7 @@ static void hists__baseline_only(struct hists *hists)
struct rb_root *root; struct rb_root *root;
struct rb_node *next; struct rb_node *next;
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root = &hists->entries_collapsed; root = &hists->entries_collapsed;
else else
root = hists->entries_in; root = hists->entries_in;
...@@ -450,7 +450,7 @@ static void hists__precompute(struct hists *hists) ...@@ -450,7 +450,7 @@ static void hists__precompute(struct hists *hists)
struct rb_root *root; struct rb_root *root;
struct rb_node *next; struct rb_node *next;
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root = &hists->entries_collapsed; root = &hists->entries_collapsed;
else else
root = hists->entries_in; root = hists->entries_in;
......
...@@ -936,7 +936,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) ...@@ -936,7 +936,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
goto error; goto error;
} }
sort__need_collapse = true; perf_hpp_list.need_collapse = true;
} }
/* Force tty output for header output and per-thread stat. */ /* Force tty output for header output and per-thread stat. */
......
...@@ -1255,7 +1255,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) ...@@ -1255,7 +1255,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)
sort__mode = SORT_MODE__TOP; sort__mode = SORT_MODE__TOP;
/* display thread wants entries to be collapsed in a different tree */ /* display thread wants entries to be collapsed in a different tree */
sort__need_collapse = 1; perf_hpp_list.need_collapse = 1;
if (top.use_stdio) if (top.use_stdio)
use_browser = 0; use_browser = 0;
......
...@@ -161,7 +161,7 @@ void print_hists_in(struct hists *hists) ...@@ -161,7 +161,7 @@ void print_hists_in(struct hists *hists)
struct rb_root *root; struct rb_root *root;
struct rb_node *node; struct rb_node *node;
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root = &hists->entries_collapsed; root = &hists->entries_collapsed;
else else
root = hists->entries_in; root = hists->entries_in;
......
...@@ -126,7 +126,7 @@ static void del_hist_entries(struct hists *hists) ...@@ -126,7 +126,7 @@ static void del_hist_entries(struct hists *hists)
struct rb_root *root_out; struct rb_root *root_out;
struct rb_node *node; struct rb_node *node;
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root_in = &hists->entries_collapsed; root_in = &hists->entries_collapsed;
else else
root_in = hists->entries_in; root_in = hists->entries_in;
......
...@@ -145,7 +145,7 @@ static int __validate_match(struct hists *hists) ...@@ -145,7 +145,7 @@ static int __validate_match(struct hists *hists)
/* /*
* Only entries from fake_common_samples should have a pair. * Only entries from fake_common_samples should have a pair.
*/ */
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root = &hists->entries_collapsed; root = &hists->entries_collapsed;
else else
root = hists->entries_in; root = hists->entries_in;
...@@ -197,7 +197,7 @@ static int __validate_link(struct hists *hists, int idx) ...@@ -197,7 +197,7 @@ static int __validate_link(struct hists *hists, int idx)
* and some entries will have no pair. However every entry * and some entries will have no pair. However every entry
* in other hists should have (dummy) pair. * in other hists should have (dummy) pair.
*/ */
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root = &hists->entries_collapsed; root = &hists->entries_collapsed;
else else
root = hists->entries_in; root = hists->entries_in;
......
...@@ -92,7 +92,7 @@ static void del_hist_entries(struct hists *hists) ...@@ -92,7 +92,7 @@ static void del_hist_entries(struct hists *hists)
struct rb_root *root_out; struct rb_root *root_out;
struct rb_node *node; struct rb_node *node;
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root_in = &hists->entries_collapsed; root_in = &hists->entries_collapsed;
else else
root_in = hists->entries_in; root_in = hists->entries_in;
......
...@@ -295,7 +295,7 @@ static void hists__delete_entry(struct hists *hists, struct hist_entry *he) ...@@ -295,7 +295,7 @@ static void hists__delete_entry(struct hists *hists, struct hist_entry *he)
root_in = &he->parent_he->hroot_in; root_in = &he->parent_he->hroot_in;
root_out = &he->parent_he->hroot_out; root_out = &he->parent_he->hroot_out;
} else { } else {
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root_in = &hists->entries_collapsed; root_in = &hists->entries_collapsed;
else else
root_in = hists->entries_in; root_in = hists->entries_in;
...@@ -1373,7 +1373,7 @@ int hists__collapse_resort(struct hists *hists, struct ui_progress *prog) ...@@ -1373,7 +1373,7 @@ int hists__collapse_resort(struct hists *hists, struct ui_progress *prog)
struct hist_entry *n; struct hist_entry *n;
int ret; int ret;
if (!sort__need_collapse) if (!hists__has(hists, need_collapse))
return 0; return 0;
hists->nr_entries = 0; hists->nr_entries = 0;
...@@ -1632,7 +1632,7 @@ static void output_resort(struct hists *hists, struct ui_progress *prog, ...@@ -1632,7 +1632,7 @@ static void output_resort(struct hists *hists, struct ui_progress *prog,
return; return;
} }
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root = &hists->entries_collapsed; root = &hists->entries_collapsed;
else else
root = hists->entries_in; root = hists->entries_in;
...@@ -2036,7 +2036,7 @@ static struct hist_entry *hists__add_dummy_entry(struct hists *hists, ...@@ -2036,7 +2036,7 @@ static struct hist_entry *hists__add_dummy_entry(struct hists *hists,
struct hist_entry *he; struct hist_entry *he;
int64_t cmp; int64_t cmp;
if (sort__need_collapse) if (hists__has(hists, need_collapse))
root = &hists->entries_collapsed; root = &hists->entries_collapsed;
else else
root = hists->entries_in; root = hists->entries_in;
...@@ -2078,7 +2078,7 @@ static struct hist_entry *hists__find_entry(struct hists *hists, ...@@ -2078,7 +2078,7 @@ static struct hist_entry *hists__find_entry(struct hists *hists,
{ {
struct rb_node *n; struct rb_node *n;
if (sort__need_collapse) if (hists__has(hists, need_collapse))
n = hists->entries_collapsed.rb_node; n = hists->entries_collapsed.rb_node;
else else
n = hists->entries_in->rb_node; n = hists->entries_in->rb_node;
...@@ -2107,7 +2107,7 @@ void hists__match(struct hists *leader, struct hists *other) ...@@ -2107,7 +2107,7 @@ void hists__match(struct hists *leader, struct hists *other)
struct rb_node *nd; struct rb_node *nd;
struct hist_entry *pos, *pair; struct hist_entry *pos, *pair;
if (sort__need_collapse) if (hists__has(leader, need_collapse))
root = &leader->entries_collapsed; root = &leader->entries_collapsed;
else else
root = leader->entries_in; root = leader->entries_in;
...@@ -2132,7 +2132,7 @@ int hists__link(struct hists *leader, struct hists *other) ...@@ -2132,7 +2132,7 @@ int hists__link(struct hists *leader, struct hists *other)
struct rb_node *nd; struct rb_node *nd;
struct hist_entry *pos, *pair; struct hist_entry *pos, *pair;
if (sort__need_collapse) if (hists__has(other, need_collapse))
root = &other->entries_collapsed; root = &other->entries_collapsed;
else else
root = other->entries_in; root = other->entries_in;
......
...@@ -82,6 +82,8 @@ struct hists { ...@@ -82,6 +82,8 @@ struct hists {
int nr_hpp_node; int nr_hpp_node;
}; };
#define hists__has(__h, __f) (__h)->hpp_list->__f
struct hist_entry_iter; struct hist_entry_iter;
struct hist_iter_ops { struct hist_iter_ops {
...@@ -238,6 +240,8 @@ struct perf_hpp_fmt { ...@@ -238,6 +240,8 @@ struct perf_hpp_fmt {
struct perf_hpp_list { struct perf_hpp_list {
struct list_head fields; struct list_head fields;
struct list_head sorts; struct list_head sorts;
int need_collapse;
}; };
extern struct perf_hpp_list perf_hpp_list; extern struct perf_hpp_list perf_hpp_list;
......
...@@ -21,7 +21,6 @@ const char *sort_order; ...@@ -21,7 +21,6 @@ const char *sort_order;
const char *field_order; const char *field_order;
regex_t ignore_callees_regex; regex_t ignore_callees_regex;
int have_ignore_callees = 0; int have_ignore_callees = 0;
int sort__need_collapse = 0;
int sort__has_parent = 0; int sort__has_parent = 0;
int sort__has_sym = 0; int sort__has_sym = 0;
int sort__has_dso = 0; int sort__has_dso = 0;
...@@ -2163,7 +2162,7 @@ static int __sort_dimension__add(struct sort_dimension *sd, ...@@ -2163,7 +2162,7 @@ static int __sort_dimension__add(struct sort_dimension *sd,
return -1; return -1;
if (sd->entry->se_collapse) if (sd->entry->se_collapse)
sort__need_collapse = 1; list->need_collapse = 1;
sd->taken = 1; sd->taken = 1;
...@@ -2746,7 +2745,7 @@ int setup_sorting(struct perf_evlist *evlist) ...@@ -2746,7 +2745,7 @@ int setup_sorting(struct perf_evlist *evlist)
void reset_output_field(void) void reset_output_field(void)
{ {
sort__need_collapse = 0; perf_hpp_list.need_collapse = 0;
sort__has_parent = 0; sort__has_parent = 0;
sort__has_sym = 0; sort__has_sym = 0;
sort__has_dso = 0; sort__has_dso = 0;
......
...@@ -31,7 +31,6 @@ extern const char *parent_pattern; ...@@ -31,7 +31,6 @@ extern const char *parent_pattern;
extern const char default_sort_order[]; extern const char default_sort_order[];
extern regex_t ignore_callees_regex; extern regex_t ignore_callees_regex;
extern int have_ignore_callees; extern int have_ignore_callees;
extern int sort__need_collapse;
extern int sort__has_dso; extern int sort__has_dso;
extern int sort__has_parent; extern int sort__has_parent;
extern int sort__has_sym; extern int sort__has_sym;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment