diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2016-05-03 13:54:45 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-05-05 21:04:00 -0300 |
| commit | 69849fc5d2119799509026df7a6fd5ffe5a578b3 (patch) | |
| tree | 6e12f693cc46358ce265f4d8269be67babacb895 /tools/perf/util/sort.c | |
| parent | 2e0453af4e16e97268b9e66aad37beb607ed7c0f (diff) | |
| download | linux-69849fc5d2119799509026df7a6fd5ffe5a578b3.tar.bz2 | |
perf hists: Move sort__has_dso 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_dso 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-5-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/sort.c')
| -rw-r--r-- | tools/perf/util/sort.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 544ab376ac42..2446c39b5fa6 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -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_dso = 0; int sort__has_socket = 0; int sort__has_thread = 0; int sort__has_comm = 0; @@ -241,7 +240,7 @@ sort__sym_cmp(struct hist_entry *left, struct hist_entry *right) * comparing symbol address alone is not enough since it's a * relative address within a dso. */ - if (!sort__has_dso) { + if (!hists__has(left->hists, dso) || hists__has(right->hists, dso)) { ret = sort__dso_cmp(left, right); if (ret != 0) return ret; @@ -2255,7 +2254,7 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok, sd->entry->se_collapse = sort__sym_sort; } else if (sd->entry == &sort_dso) { - sort__has_dso = 1; + list->dso = 1; } else if (sd->entry == &sort_socket) { sort__has_socket = 1; } else if (sd->entry == &sort_thread) { @@ -2746,7 +2745,7 @@ void reset_output_field(void) perf_hpp_list.need_collapse = 0; perf_hpp_list.parent = 0; perf_hpp_list.sym = 0; - sort__has_dso = 0; + perf_hpp_list.dso = 0; field_order = NULL; sort_order = NULL; |