[PATCH 1/4] perf hists browser: Check DSO related context menu

From: Namhyung Kim
Date: Sat Jan 23 2016 - 08:32:50 EST


Show DSO filter and map browser context menu only if sort key has dso.
Otherwise those info will be incorrect.

Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
---
tools/perf/ui/browsers/hists.c | 14 ++++++++------
tools/perf/util/sort.h | 1 +
2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 0c123d0938d4..683b4d8a0aa3 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -2298,12 +2298,14 @@ skip_annotation:
nr_options += add_thread_opt(browser, &actions[nr_options],
&options[nr_options], thread);
}
- nr_options += add_dso_opt(browser, &actions[nr_options],
- &options[nr_options], map);
- nr_options += add_map_opt(browser, &actions[nr_options],
- &options[nr_options],
- browser->selection ?
- browser->selection->map : NULL);
+ if (sort__has_dso) {
+ nr_options += add_dso_opt(browser, &actions[nr_options],
+ &options[nr_options], map);
+ nr_options += add_map_opt(browser, &actions[nr_options],
+ &options[nr_options],
+ browser->selection ?
+ browser->selection->map : NULL);
+ }
nr_options += add_socket_opt(browser, &actions[nr_options],
&options[nr_options],
socked_id);
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 09616f03d412..59fc962b866f 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -34,6 +34,7 @@ extern int have_ignore_callees;
extern int sort__need_collapse;
extern int sort__has_parent;
extern int sort__has_sym;
+extern int sort__has_dso;
extern int sort__has_socket;
extern int sort__has_thread;
extern enum sort_mode sort__mode;
--
2.6.4