lkml.org 
[lkml]   [2012]   [Oct]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/12] 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.

    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Stephane Eranian <eranian@google.com>
    Acked-by: Jiri Olsa <jolsa@redhat.com>
    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    ---
    tools/perf/util/evlist.c | 10 ++++++++--
    tools/perf/util/evlist.h | 1 +
    tools/perf/util/evsel.h | 10 ++++++++++
    tools/perf/util/parse-events.c | 1 +
    tools/perf/util/parse-events.h | 1 +
    tools/perf/util/parse-events.y | 10 ++++++++++
    6 files changed, 31 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
    index a41dc4a5c2de..561bdfbf8d4f 100644
    --- a/tools/perf/util/evlist.c
    +++ b/tools/perf/util/evlist.c
    @@ -111,20 +111,26 @@ void perf_evlist__splice_list_tail(struct perf_evlist *evlist,
    void __perf_evlist__set_leader(struct list_head *list)
    {
    struct perf_evsel *evsel, *leader;
    + int count = 0;

    leader = list_entry(list->next, struct perf_evsel, node);
    leader->leader = NULL;

    list_for_each_entry(evsel, list, node) {
    - if (evsel != leader)
    + if (evsel != leader) {
    evsel->leader = leader;
    + evsel->group_idx = count++;
    + }
    }
    + leader->nr_members = count;
    }

    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 56003f779e60..fa76bf91c7e0 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 3ead0d59c03d..407c8e84fee3 100644
    --- a/tools/perf/util/evsel.h
    +++ b/tools/perf/util/evsel.h
    @@ -74,6 +74,10 @@ struct perf_evsel {
    int exclude_GH;
    struct perf_evsel *leader;
    char *group_name;
    + union {
    + int nr_members;
    + int group_idx;
    + };
    };

    struct cpu_map;
    @@ -225,4 +229,10 @@ static inline struct perf_evsel *perf_evsel__next(struct perf_evsel *evsel)
    {
    return list_entry(evsel->node.next, struct perf_evsel, node);
    }
    +
    +/* Treat a non-group event as a leader */
    +static inline bool perf_evsel__is_group_leader(struct perf_evsel *evsel)
    +{
    + return evsel->leader == NULL;
    +}
    #endif /* __PERF_EVSEL_H */
    diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
    index e14e4365e8bd..b9b5eb711e75 100644
    --- a/tools/perf/util/parse-events.c
    +++ b/tools/perf/util/parse-events.c
    @@ -819,6 +819,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 c356e443448d..f6b0254afe17 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 cd88209e3c58..a7810dd0938a 100644
    --- a/tools/perf/util/parse-events.y
    +++ b/tools/perf/util/parse-events.y
    @@ -122,6 +122,11 @@ group_def:
    PE_NAME '{' events '}'
    {
    struct list_head *list = $3;
    + struct parse_events_data__events *data = _data;
    +
    + /* Count groups only have more than 1 members */
    + if (!list_is_last(list->next, list))
    + data->nr_groups++;

    parse_events__set_leader($1, list);
    $$ = list;
    @@ -130,6 +135,11 @@ PE_NAME '{' events '}'
    '{' events '}'
    {
    struct list_head *list = $2;
    + struct parse_events_data__events *data = _data;
    +
    + /* Count groups only have more than 1 members */
    + if (!list_is_last(list->next, list))
    + data->nr_groups++;

    parse_events__set_leader(NULL, list);
    $$ = list;
    --
    1.7.11.7


    \
     
     \ /
      Last update: 2012-10-23 11:01    [W:3.003 / U:0.108 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site