aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2013-04-26 13:28:46 -0400
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-05-28 09:23:56 -0400
commit9c796ec8dbc8dbfe41ce35a1ccb1b59b47148daf (patch)
tree022e3da005b4815ad27ce4f43e84756b412a7a01
parent8f0f684b7b640caeca319f7f4e18474d099d8606 (diff)
perf hists browser: Use sort__has_sym
The TUI hist browser had a similar variable has_symbols for the same purpose. Let's get rid of the duplication. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Andi Kleen <andi@firstfloor.org> Cc: David Ahern <dsahern@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1365125198-8334-9-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/ui/browsers/hists.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index cad8e37f05d9..a4268cab1921 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -25,7 +25,6 @@ struct hist_browser {
25 struct map_symbol *selection; 25 struct map_symbol *selection;
26 int print_seq; 26 int print_seq;
27 bool show_dso; 27 bool show_dso;
28 bool has_symbols;
29}; 28};
30 29
31extern void hist_browser__init_hpp(void); 30extern void hist_browser__init_hpp(void);
@@ -1155,10 +1154,6 @@ static struct hist_browser *hist_browser__new(struct hists *hists)
1155 browser->b.refresh = hist_browser__refresh; 1154 browser->b.refresh = hist_browser__refresh;
1156 browser->b.seek = ui_browser__hists_seek; 1155 browser->b.seek = ui_browser__hists_seek;
1157 browser->b.use_navkeypressed = true; 1156 browser->b.use_navkeypressed = true;
1158 if (sort__mode == SORT_MODE__BRANCH)
1159 browser->has_symbols = sort_sym_from.list.next != NULL;
1160 else
1161 browser->has_symbols = sort_sym.list.next != NULL;
1162 } 1157 }
1163 1158
1164 return browser; 1159 return browser;
@@ -1386,7 +1381,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
1386 */ 1381 */
1387 goto out_free_stack; 1382 goto out_free_stack;
1388 case 'a': 1383 case 'a':
1389 if (!browser->has_symbols) { 1384 if (!sort__has_sym) {
1390 ui_browser__warning(&browser->b, delay_secs * 2, 1385 ui_browser__warning(&browser->b, delay_secs * 2,
1391 "Annotation is only available for symbolic views, " 1386 "Annotation is only available for symbolic views, "
1392 "include \"sym*\" in --sort to use it."); 1387 "include \"sym*\" in --sort to use it.");
@@ -1485,7 +1480,7 @@ static int perf_evsel__hists_browse(struct perf_evsel *evsel, int nr_events,
1485 continue; 1480 continue;
1486 } 1481 }
1487 1482
1488 if (!browser->has_symbols) 1483 if (!sort__has_sym)
1489 goto add_exit_option; 1484 goto add_exit_option;
1490 1485
1491 if (sort__mode == SORT_MODE__BRANCH) { 1486 if (sort__mode == SORT_MODE__BRANCH) {