lkml.org 
[lkml]   [2016]   [May]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/7] perf tools: Move sort__has_dso into struct perf_hpp_list
    Date
    Now we have sort dimensions private for struct hists,
    we need to make dimension booleans hists specific as
    well.

    Moving sort__has_dso into struct perf_hpp_list.

    Link: http://lkml.kernel.org/n/tip-8wcj3m487je58r8ss227zpne@git.kernel.org
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    ---
    tools/perf/ui/browsers/hists.c | 8 ++++----
    tools/perf/util/hist.h | 1 +
    tools/perf/util/sort.c | 7 +++----
    tools/perf/util/sort.h | 1 -
    4 files changed, 8 insertions(+), 9 deletions(-)

    diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
    index b66bf83ed883..6b2f95300e35 100644
    --- a/tools/perf/ui/browsers/hists.c
    +++ b/tools/perf/ui/browsers/hists.c
    @@ -2380,7 +2380,7 @@ do_zoom_dso(struct hist_browser *browser, struct popup_action *act)
    {
    struct map *map = act->ms.map;

    - if (!sort__has_dso || map == NULL)
    + if (!hists__has(browser->hists, dso) || map == NULL)
    return 0;

    if (browser->hists->dso_filter) {
    @@ -2407,7 +2407,7 @@ static int
    add_dso_opt(struct hist_browser *browser, struct popup_action *act,
    char **optstr, struct map *map)
    {
    - if (!sort__has_dso || map == NULL)
    + if (!hists__has(browser->hists, dso) || map == NULL)
    return 0;

    if (asprintf(optstr, "Zoom %s %s DSO",
    @@ -2429,10 +2429,10 @@ do_browse_map(struct hist_browser *browser __maybe_unused,
    }

    static int
    -add_map_opt(struct hist_browser *browser __maybe_unused,
    +add_map_opt(struct hist_browser *browser,
    struct popup_action *act, char **optstr, struct map *map)
    {
    - if (!sort__has_dso || map == NULL)
    + if (!hists__has(browser->hists, dso) || map == NULL)
    return 0;

    if (asprintf(optstr, "Browse map details") < 0)
    diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
    index c3a77502e22b..4302f34f36ae 100644
    --- a/tools/perf/util/hist.h
    +++ b/tools/perf/util/hist.h
    @@ -244,6 +244,7 @@ struct perf_hpp_list {
    int need_collapse;
    int parent;
    int sym;
    + int dso;
    };

    extern struct perf_hpp_list perf_hpp_list;
    diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
    index 544ab376ac42..2446c39b5fa6 100644
    --- a/tools/perf/util/sort.c
    +++ b/tools/perf/util/sort.c
    @@ -21,7 +21,6 @@ const char *sort_order;
    const char *field_order;
    regex_t ignore_callees_regex;
    int have_ignore_callees = 0;
    -int sort__has_dso = 0;
    int sort__has_socket = 0;
    int sort__has_thread = 0;
    int sort__has_comm = 0;
    @@ -241,7 +240,7 @@ sort__sym_cmp(struct hist_entry *left, struct hist_entry *right)
    * comparing symbol address alone is not enough since it's a
    * relative address within a dso.
    */
    - if (!sort__has_dso) {
    + if (!hists__has(left->hists, dso) || hists__has(right->hists, dso)) {
    ret = sort__dso_cmp(left, right);
    if (ret != 0)
    return ret;
    @@ -2255,7 +2254,7 @@ static int sort_dimension__add(struct perf_hpp_list *list, const char *tok,
    sd->entry->se_collapse = sort__sym_sort;

    } else if (sd->entry == &sort_dso) {
    - sort__has_dso = 1;
    + list->dso = 1;
    } else if (sd->entry == &sort_socket) {
    sort__has_socket = 1;
    } else if (sd->entry == &sort_thread) {
    @@ -2746,7 +2745,7 @@ void reset_output_field(void)
    perf_hpp_list.need_collapse = 0;
    perf_hpp_list.parent = 0;
    perf_hpp_list.sym = 0;
    - sort__has_dso = 0;
    + perf_hpp_list.dso = 0;

    field_order = NULL;
    sort_order = NULL;
    diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
    index 9a5e7d4a2cac..87d4addf92b5 100644
    --- a/tools/perf/util/sort.h
    +++ b/tools/perf/util/sort.h
    @@ -31,7 +31,6 @@ extern const char *parent_pattern;
    extern const char default_sort_order[];
    extern regex_t ignore_callees_regex;
    extern int have_ignore_callees;
    -extern int sort__has_dso;
    extern int sort__has_socket;
    extern int sort__has_thread;
    extern int sort__has_comm;
    --
    2.4.11
    \
     
     \ /
      Last update: 2016-05-03 14:21    [W:3.350 / U:0.388 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site