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 <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index b66bf83ed8835500e031037772d7d844a4416dc0..6b2f95300e3541ca51867291e926404430c2cdfd 100644 (file)
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -2380,7 +2380,7 @@ do_zoom_dso(struct hist_browser *browser, struct popup_action *act)
 {
        struct map *map = act->ms.map;
 
-       if (!sort__has_dso || map == NULL)
+       if (!hists__has(browser->hists, dso) || map == NULL)
                return 0;
 
        if (browser->hists->dso_filter) {
@@ -2407,7 +2407,7 @@ static int
 add_dso_opt(struct hist_browser *browser, struct popup_action *act,
            char **optstr, struct map *map)
 {
-       if (!sort__has_dso || map == NULL)
+       if (!hists__has(browser->hists, dso) || map == NULL)
                return 0;
 
        if (asprintf(optstr, "Zoom %s %s DSO",
@@ -2429,10 +2429,10 @@ do_browse_map(struct hist_browser *browser __maybe_unused,
 }
 
 static int
-add_map_opt(struct hist_browser *browser __maybe_unused,
+add_map_opt(struct hist_browser *browser,
            struct popup_action *act, char **optstr, struct map *map)
 {
-       if (!sort__has_dso || map == NULL)
+       if (!hists__has(browser->hists, dso) || map == NULL)
                return 0;
 
        if (asprintf(optstr, "Browse map details") < 0)

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index c3a77502e22be15be52488021e1156247c19b0fa..4302f34f36aedc320a9a1594b0f9917e844aecb6 100644 (file)
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -244,6 +244,7 @@ struct perf_hpp_list {
        int need_collapse;
        int parent;
        int sym;
+       int dso;
 };
 
 extern struct perf_hpp_list perf_hpp_list;

diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 544ab376ac42c71ccb16eafb61b598fd21c67a62..2446c39b5fa6f4c28f5827a272a5dea8726294e1 100644 (file)
--- 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;

diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 9a5e7d4a2cacaf051695f07c5bb46383dd8ce3b1..87d4addf92b589daddb57ce21c91e9331878c3e2 100644 (file)
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -31,7 +31,6 @@ extern const char *parent_pattern;
 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_socket;
 extern int sort__has_thread;
 extern int sort__has_comm;