lkml.org 
[lkml]   [2013]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/13] perf tools: Keep group information
    Date
    From: Namhyung Kim <namhyung.kim@lge.com>

    Add a few of group-related field in struct perf_{evlist,evsel} so that
    the group information in a evlist can be known easily. It only counts
    groups which have more than 1 members since leader-only groups are
    treated as non-group events.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    Acked-by: Jiri Olsa <jolsa@redhat.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Cc: Stephane Eranian <eranian@google.com>
    Link: http://lkml.kernel.org/r/1355726345-29553-2-git-send-email-namhyung@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/util/evlist.c | 7 ++++++-
    tools/perf/util/evlist.h | 1 +
    tools/perf/util/evsel.h | 6 ++++++
    tools/perf/util/parse-events.c | 1 +
    tools/perf/util/parse-events.h | 1 +
    tools/perf/util/parse-events.y | 10 ++++++++++
    6 files changed, 25 insertions(+), 1 deletion(-)

    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index dc8aee97a488..eddd5ebcd690 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -117,6 +117,9 @@ void __perf_evlist__set_leader(struct list_head *list)
    struct perf_evsel *evsel, *leader;

    leader = list_entry(list->next, struct perf_evsel, node);
    + evsel = list_entry(list->prev, struct perf_evsel, node);
    +
    + leader->nr_members = evsel->idx - leader->idx + 1;

    list_for_each_entry(evsel, list, node) {
    if (evsel != leader)
    @@ -126,8 +129,10 @@ void __perf_evlist__set_leader(struct list_head *list)

    void perf_evlist__set_leader(struct perf_evlist *evlist)
    {
    - if (evlist->nr_entries)
    + if (evlist->nr_entries) {
    + evlist->nr_groups = evlist->nr_entries > 1 ? 1 : 0;
    __perf_evlist__set_leader(&evlist->entries);
    + }
    }

    int perf_evlist__add_default(struct perf_evlist *evlist)
    diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
    index 457e2350d21d..73579a25a93e 100644
    --- a/tools/perf/util/evlist.h
    +++ b/tools/perf/util/evlist.h
    @@ -21,6 +21,7 @@ struct perf_evlist {
    struct list_head entries;
    struct hlist_head heads[PERF_EVLIST__HLIST_SIZE];
    int nr_entries;
    + int nr_groups;
    int nr_fds;
    int nr_mmaps;
    int mmap_len;
    diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
    index c68d1b82e843..f5d22f12ccd8 100644
    --- a/tools/perf/util/evsel.h
    +++ b/tools/perf/util/evsel.h
    @@ -73,6 +73,7 @@ struct perf_evsel {
    bool needs_swap;
    /* parse modifier helper */
    int exclude_GH;
    + int nr_members;
    struct perf_evsel *leader;
    char *group_name;
    };
    @@ -257,4 +258,9 @@ bool perf_evsel__fallback(struct perf_evsel *evsel, int err,
    int perf_evsel__open_strerror(struct perf_evsel *evsel,
    struct perf_target *target,
    int err, char *msg, size_t size);
    +
    +static inline int perf_evsel__group_idx(struct perf_evsel *evsel)
    +{
    + return evsel->idx - evsel->leader->idx;
    +}
    #endif /* __PERF_EVSEL_H */
    diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
    index 626c120f00da..64d663192495 100644
    --- a/tools/perf/util/parse-events.c
    +++ b/tools/perf/util/parse-events.c
    @@ -885,6 +885,7 @@ int parse_events(struct perf_evlist *evlist, const char *str,
    if (!ret) {
    int entries = data.idx - evlist->nr_entries;
    perf_evlist__splice_list_tail(evlist, &data.list, entries);
    + evlist->nr_groups += data.nr_groups;
    return 0;
    }

    diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
    index b7af80b8bdda..330b8896876b 100644
    --- a/tools/perf/util/parse-events.h
    +++ b/tools/perf/util/parse-events.h
    @@ -65,6 +65,7 @@ struct parse_events__term {
    struct parse_events_data__events {
    struct list_head list;
    int idx;
    + int nr_groups;
    };

    struct parse_events_data__terms {
    diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y
    index 0f9914ae6bac..7f2d63afcf38 100644
    --- a/tools/perf/util/parse-events.y
    +++ b/tools/perf/util/parse-events.y
    @@ -23,6 +23,14 @@ do { \
    YYABORT; \
    } while (0)

    +static inc_group_count(struct list_head *list,
    + struct parse_events_data__events *data)
    +{
    + /* Count groups only have more than 1 members */
    + if (!list_is_last(list->next, list))
    + data->nr_groups++;
    +}
    +
    %}

    %token PE_START_EVENTS PE_START_TERMS
    @@ -123,6 +131,7 @@ PE_NAME '{' events '}'
    {
    struct list_head *list = $3;

    + inc_group_count(list, _data);
    parse_events__set_leader($1, list);
    $$ = list;
    }
    @@ -131,6 +140,7 @@ PE_NAME '{' events '}'
    {
    struct list_head *list = $2;

    + inc_group_count(list, _data);
    parse_events__set_leader(NULL, list);
    $$ = list;
    }
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2013-01-15 09:21    [W:4.456 / U:0.512 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site