lkml.org 
[lkml]   [2020]   [Apr]   [27]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/7] perf top: Move sb_evlist to 'struct perf_top'
    Date
    From: Arnaldo Carvalho de Melo <acme@redhat.com>

    Where state related to a 'perf top' session is grouped.

    Cc: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Jiri Olsa <jolsa@kernel.org>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Song Liu <songliubraving@fb.com>
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-top.c | 7 +++----
    tools/perf/util/top.h | 2 +-
    2 files changed, 4 insertions(+), 5 deletions(-)

    diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c
    index 6b067a5ba1d5..70e1c732db6a 100644
    --- a/tools/perf/builtin-top.c
    +++ b/tools/perf/builtin-top.c
    @@ -1580,7 +1580,6 @@ int cmd_top(int argc, const char **argv)
    OPTS_EVSWITCH(&top.evswitch),
    OPT_END()
    };
    - struct evlist *sb_evlist = NULL;
    const char * const top_usage[] = {
    "perf top [<options>]",
    NULL
    @@ -1744,9 +1743,9 @@ int cmd_top(int argc, const char **argv)
    }

    if (!top.record_opts.no_bpf_event)
    - bpf_event__add_sb_event(&sb_evlist, &perf_env);
    + bpf_event__add_sb_event(&top.sb_evlist, &perf_env);

    - if (perf_evlist__start_sb_thread(sb_evlist, target)) {
    + if (perf_evlist__start_sb_thread(top.sb_evlist, target)) {
    pr_debug("Couldn't start the BPF side band thread:\nBPF programs starting from now on won't be annotatable\n");
    opts->no_bpf_event = true;
    }
    @@ -1754,7 +1753,7 @@ int cmd_top(int argc, const char **argv)
    status = __cmd_top(&top);

    if (!opts->no_bpf_event)
    - perf_evlist__stop_sb_thread(sb_evlist);
    + perf_evlist__stop_sb_thread(top.sb_evlist);

    out_delete_evlist:
    evlist__delete(top.evlist);
    diff --git a/tools/perf/util/top.h b/tools/perf/util/top.h
    index 45dc84ddff37..ff8391208ecd 100644
    --- a/tools/perf/util/top.h
    +++ b/tools/perf/util/top.h
    @@ -18,7 +18,7 @@ struct perf_session;

    struct perf_top {
    struct perf_tool tool;
    - struct evlist *evlist;
    + struct evlist *evlist, *sb_evlist;
    struct record_opts record_opts;
    struct annotation_options annotation_opts;
    struct evswitch evswitch;
    --
    2.21.1
    \
     
     \ /
      Last update: 2020-04-27 23:20    [W:2.190 / U:0.260 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site