| From c221acb0f970d3b80d72c812cda19c121acf5d52 Mon Sep 17 00:00:00 2001 |
| From: Namhyung Kim <namhyung@kernel.org> |
| Date: Thu, 21 Jan 2016 19:50:09 -0300 |
| Subject: perf hists browser: Only offer symbol scripting when a symbol is under the cursor |
| |
| From: Namhyung Kim <namhyung@kernel.org> |
| |
| commit c221acb0f970d3b80d72c812cda19c121acf5d52 upstream. |
| |
| When this feature was introduced a check was made if there was a |
| resolved symbol under the cursor, it got lost in commit ea7cd5923309 |
| ("perf hists browser: Split popup menu actions - part 2"), reinstate it. |
| |
| Signed-off-by: Namhyung Kim <namhyung@kernel.org> |
| Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Cc: Andi Kleen <andi@firstfloor.org> |
| Cc: David Ahern <dsahern@gmail.com> |
| Cc: Jiri Olsa <jolsa@kernel.org>, |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Stephane Eranian <eranian@google.com> |
| Cc: Wang Nan <wangnan0@huawei.com> |
| Fixes: ea7cd5923309 ("perf hists browser: Split popup menu actions - part 2") |
| Link: http://lkml.kernel.org/r/1452960197-5323-9-git-send-email-namhyung@kernel.org |
| [ Carved out from a larger patch ] |
| Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| tools/perf/ui/browsers/hists.c | 10 ++++++---- |
| 1 file changed, 6 insertions(+), 4 deletions(-) |
| |
| --- a/tools/perf/ui/browsers/hists.c |
| +++ b/tools/perf/ui/browsers/hists.c |
| @@ -2320,10 +2320,12 @@ skip_annotation: |
| * |
| * See hist_browser__show_entry. |
| */ |
| - nr_options += add_script_opt(browser, |
| - &actions[nr_options], |
| - &options[nr_options], |
| - NULL, browser->selection->sym); |
| + if (sort__has_sym && browser->selection->sym) { |
| + nr_options += add_script_opt(browser, |
| + &actions[nr_options], |
| + &options[nr_options], |
| + NULL, browser->selection->sym); |
| + } |
| } |
| nr_options += add_script_opt(browser, &actions[nr_options], |
| &options[nr_options], NULL, NULL); |
