lkml.org 
[lkml]   [2016]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/19] perf tools: Add more sort entry check functions
    Date
    From: Namhyung Kim <namhyung@kernel.org>

    Those functions are for checkinf if a given perf_hpp_fmt is a
    filter-related sort entry. With hierarchy mode, it needs to check
    filters on the hist entries with its own hpp format list.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    Tested-by: Jiri Olsa <jolsa@kernel.org>
    Cc: Andi Kleen <andi@firstfloor.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Cc: Stephane Eranian <eranian@google.com>
    Cc: Wang Nan <wangnan0@huawei.com>
    Link: http://lkml.kernel.org/r/1457531222-18130-3-git-send-email-namhyung@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/hist.h | 4 ++++
    tools/perf/util/sort.c | 50 +++++++++++++++++++-------------------------------
    2 files changed, 23 insertions(+), 31 deletions(-)

    diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
    index 2cb017f28f9e..6870a1bfd762 100644
    --- a/tools/perf/util/hist.h
    +++ b/tools/perf/util/hist.h
    @@ -318,6 +318,10 @@ bool perf_hpp__defined_dynamic_entry(struct perf_hpp_fmt *fmt, struct hists *his
    bool perf_hpp__is_trace_entry(struct perf_hpp_fmt *fmt);
    bool perf_hpp__is_srcline_entry(struct perf_hpp_fmt *fmt);
    bool perf_hpp__is_srcfile_entry(struct perf_hpp_fmt *fmt);
    +bool perf_hpp__is_thread_entry(struct perf_hpp_fmt *fmt);
    +bool perf_hpp__is_comm_entry(struct perf_hpp_fmt *fmt);
    +bool perf_hpp__is_dso_entry(struct perf_hpp_fmt *fmt);
    +bool perf_hpp__is_sym_entry(struct perf_hpp_fmt *fmt);

    struct perf_hpp_fmt *perf_hpp_fmt__dup(struct perf_hpp_fmt *fmt);

    diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
    index 8a49a07ebea6..61c74022e47f 100644
    --- a/tools/perf/util/sort.c
    +++ b/tools/perf/util/sort.c
    @@ -1488,38 +1488,26 @@ bool perf_hpp__is_sort_entry(struct perf_hpp_fmt *format)
    return format->header == __sort__hpp_header;
    }

    -bool perf_hpp__is_trace_entry(struct perf_hpp_fmt *fmt)
    -{
    - struct hpp_sort_entry *hse;
    +#define MK_SORT_ENTRY_CHK(key) \
    +bool perf_hpp__is_ ## key ## _entry(struct perf_hpp_fmt *fmt) \
    +{ \
    + struct hpp_sort_entry *hse; \
    + \
    + if (!perf_hpp__is_sort_entry(fmt)) \
    + return false; \
    + \
    + hse = container_of(fmt, struct hpp_sort_entry, hpp); \
    + return hse->se == &sort_ ## key ; \
    +}
    +
    +MK_SORT_ENTRY_CHK(trace)
    +MK_SORT_ENTRY_CHK(srcline)
    +MK_SORT_ENTRY_CHK(srcfile)
    +MK_SORT_ENTRY_CHK(thread)
    +MK_SORT_ENTRY_CHK(comm)
    +MK_SORT_ENTRY_CHK(dso)
    +MK_SORT_ENTRY_CHK(sym)

    - if (!perf_hpp__is_sort_entry(fmt))
    - return false;
    -
    - hse = container_of(fmt, struct hpp_sort_entry, hpp);
    - return hse->se == &sort_trace;
    -}
    -
    -bool perf_hpp__is_srcline_entry(struct perf_hpp_fmt *fmt)
    -{
    - struct hpp_sort_entry *hse;
    -
    - if (!perf_hpp__is_sort_entry(fmt))
    - return false;
    -
    - hse = container_of(fmt, struct hpp_sort_entry, hpp);
    - return hse->se == &sort_srcline;
    -}
    -
    -bool perf_hpp__is_srcfile_entry(struct perf_hpp_fmt *fmt)
    -{
    - struct hpp_sort_entry *hse;
    -
    - if (!perf_hpp__is_sort_entry(fmt))
    - return false;
    -
    - hse = container_of(fmt, struct hpp_sort_entry, hpp);
    - return hse->se == &sort_srcfile;
    -}

    static bool __sort__hpp_equal(struct perf_hpp_fmt *a, struct perf_hpp_fmt *b)
    {
    --
    2.5.0
    \
     
     \ /
      Last update: 2016-03-10 22:41    [W:3.511 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site