Messages in this thread Patch in this message | | | Date | Tue, 26 Jan 2016 15:35:43 -0300 | From | Arnaldo Carvalho de Melo <> | Subject | Re: [PATCH 4/4] perf hists browser: Check script context menu |
| |
Em Sat, Jan 23, 2016 at 10:31:42PM +0900, Namhyung Kim escreveu: > The script and data-switch context menu are only meaningful when it > deals with a data file. So add a check so that it cannot be shown when > perf-top is run. > > Signed-off-by: Namhyung Kim <namhyung@kernel.org> > --- > tools/perf/ui/browsers/hists.c | 12 +++++++----- > 1 file changed, 7 insertions(+), 5 deletions(-) > > diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c > index 05e94feba3cb..0affffeed89c 100644 > --- a/tools/perf/ui/browsers/hists.c > +++ b/tools/perf/ui/browsers/hists.c > @@ -2309,7 +2309,7 @@ skip_annotation: > socked_id); > } > /* perf script support */
I instead used:
if (is_report_browser(hbt) goto skip_scripting;
> - if (browser->he_selection) {
> + if (is_report_browser(hbt) && browser->he_selection) { > if (sort__has_thread) { > nr_options += add_script_opt(browser, > &actions[nr_options], > @@ -2332,10 +2332,12 @@ skip_annotation: > NULL, browser->selection->sym); > } > } > - nr_options += add_script_opt(browser, &actions[nr_options], > - &options[nr_options], NULL, NULL); > - nr_options += add_switch_opt(browser, &actions[nr_options], > - &options[nr_options]); > + if (is_report_browser(hbt)) { > + nr_options += add_script_opt(browser, &actions[nr_options], > + &options[nr_options], NULL, NULL); > + nr_options += add_switch_opt(browser, &actions[nr_options], > + &options[nr_options]); > + }
skip_scripting:
> nr_options += add_exit_opt(browser, &actions[nr_options], > &options[nr_options]); >
Also the other patches in this series were already done in my tree, carved out from your initial patch but instead checking things at add_foo_opt() in most cases,
I'll push it to Ingo to work on another batch, after Jiri's questions are sorted out,
| |