lkml.org 
[lkml]   [2016]   [Jan]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/26] perf hists browser: Only 'Zoom into thread' only when sort order has 'pid'
    Date
    From: Namhyung Kim <namhyung@kernel.org>

    We can't offer a zoom into thread when a bucket (struct hist_entry) may
    have samples for more than one thread, i.e. when 'pid' is not part of
    the sort order, fix 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>
    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>
    ---
    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 08c09ad755d2..e66b3a30dd9f 100644
    --- a/tools/perf/ui/browsers/hists.c
    +++ b/tools/perf/ui/browsers/hists.c
    @@ -1782,7 +1782,7 @@ static int
    add_thread_opt(struct hist_browser *browser, struct popup_action *act,
    char **optstr, struct thread *thread)
    {
    - if (thread == NULL)
    + if (!sort__has_thread || thread == NULL)
    return 0;

    if (asprintf(optstr, "Zoom %s %s(%d) thread",
    @@ -2307,10 +2307,12 @@ skip_annotation:
    socked_id);
    /* perf script support */
    if (browser->he_selection) {
    - nr_options += add_script_opt(browser,
    - &actions[nr_options],
    - &options[nr_options],
    - thread, NULL);
    + if (sort__has_thread && thread) {
    + nr_options += add_script_opt(browser,
    + &actions[nr_options],
    + &options[nr_options],
    + thread, NULL);
    + }
    /*
    * Note that browser->selection != NULL
    * when browser->he_selection is not NULL,
    --
    2.5.0
    \
     
     \ /
      Last update: 2016-01-26 21:01    [W:2.567 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site