lkml.org 
[lkml]   [2016]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf hists: Allocate output sort field
    Commit-ID:  1945c3e734cd1f01535dc76de47c38bbe9a87352
    Gitweb: http://git.kernel.org/tip/1945c3e734cd1f01535dc76de47c38bbe9a87352
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Mon, 18 Jan 2016 10:24:07 +0100
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Wed, 3 Feb 2016 12:24:07 -0300

    perf hists: Allocate output sort field

    Currently we use static output fields, because we have single global
    list of all sort/output fields.

    We will add hists specific sort and output lists in following patches,
    so we need all format entries to be dynamically allocated. Adding
    support to allocate output sort field.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1453109064-1026-10-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/ui/hist.c | 16 ++++++++++++++--
    tools/perf/util/sort.c | 41 +++++++++++++++++++++++++++++++++--------
    2 files changed, 47 insertions(+), 10 deletions(-)

    diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
    index b0fcaec..c877c52 100644
    --- a/tools/perf/ui/hist.c
    +++ b/tools/perf/ui/hist.c
    @@ -533,11 +533,23 @@ void perf_hpp__column_disable(unsigned col)

    void perf_hpp__cancel_cumulate(void)
    {
    + struct perf_hpp_fmt *fmt, *acc, *ovh, *tmp;
    +
    if (is_strict_order(field_order))
    return;

    - perf_hpp__column_disable(PERF_HPP__OVERHEAD_ACC);
    - perf_hpp__format[PERF_HPP__OVERHEAD].name = "Overhead";
    + ovh = &perf_hpp__format[PERF_HPP__OVERHEAD];
    + acc = &perf_hpp__format[PERF_HPP__OVERHEAD_ACC];
    +
    + perf_hpp__for_each_format_safe(fmt, tmp) {
    + if (acc->equal(acc, fmt)) {
    + perf_hpp__column_unregister(fmt);
    + continue;
    + }
    +
    + if (ovh->equal(ovh, fmt))
    + fmt->name = "Overhead";
    + }
    }

    static bool fmt_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)
    diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
    index 170f7f7..52e4a36 100644
    --- a/tools/perf/util/sort.c
    +++ b/tools/perf/util/sort.c
    @@ -1577,6 +1577,19 @@ __sort_dimension__alloc_hpp(struct sort_dimension *sd)
    return hse;
    }

    +static struct perf_hpp_fmt *__hpp_dimension__alloc_hpp(struct hpp_dimension *hd)
    +{
    + struct perf_hpp_fmt *fmt;
    +
    + fmt = memdup(hd->fmt, sizeof(*fmt));
    + if (fmt) {
    + INIT_LIST_HEAD(&fmt->list);
    + INIT_LIST_HEAD(&fmt->sort_list);
    + }
    +
    + return fmt;
    +}
    +
    static int __sort_dimension__add_hpp_sort(struct sort_dimension *sd)
    {
    struct hpp_sort_entry *hse = __sort_dimension__alloc_hpp(sd);
    @@ -2066,11 +2079,17 @@ static int __sort_dimension__add(struct sort_dimension *sd)

    static int __hpp_dimension__add(struct hpp_dimension *hd)
    {
    - if (!hd->taken) {
    - hd->taken = 1;
    + struct perf_hpp_fmt *fmt;

    - perf_hpp__register_sort_field(hd->fmt);
    - }
    + if (hd->taken)
    + return 0;
    +
    + fmt = __hpp_dimension__alloc_hpp(hd);
    + if (!fmt)
    + return -1;
    +
    + hd->taken = 1;
    + perf_hpp__register_sort_field(fmt);
    return 0;
    }

    @@ -2088,11 +2107,17 @@ static int __sort_dimension__add_output(struct sort_dimension *sd)

    static int __hpp_dimension__add_output(struct hpp_dimension *hd)
    {
    - if (!hd->taken) {
    - hd->taken = 1;
    + struct perf_hpp_fmt *fmt;

    - perf_hpp__column_register(hd->fmt);
    - }
    + if (hd->taken)
    + return 0;
    +
    + fmt = __hpp_dimension__alloc_hpp(hd);
    + if (!fmt)
    + return -1;
    +
    + hd->taken = 1;
    + perf_hpp__column_register(fmt);
    return 0;
    }

    \
     
     \ /
      Last update: 2016-02-04 14:21    [W:12.114 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site