lkml.org 
[lkml]   [2016]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 143/163] perf hists browser: Only offer symbol scripting when a symbol is under the cursor
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    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
    @@ -2059,10 +2059,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);

    \
     
     \ /
      Last update: 2016-05-03 03:01    [W:3.143 / U:0.132 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site