lkml.org 
[lkml]   [2020]   [Apr]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH v2 13/13] perf metricgroup: Support adding metrics for system PMUs
    Date
    Currently only adding metrics for core- or uncore-based events is
    supported. Extend this for system events.

    Signed-off-by: John Garry <john.garry@huawei.com>
    ---
    tools/perf/util/metricgroup.c | 40 ++++++++++++++++++++++++++++++++++++----
    1 file changed, 36 insertions(+), 4 deletions(-)

    diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
    index 81a6aa04a601..85bf5333e4c6 100644
    --- a/tools/perf/util/metricgroup.c
    +++ b/tools/perf/util/metricgroup.c
    @@ -593,17 +593,34 @@ static int metricgroup__add_metric_pmu_event(struct pmu_event *pe,
    return 0;
    }

    +struct metricgroup_add_iter_data {
    + const char *metric;
    + struct strbuf *events;
    + struct list_head *group_list;
    + int *ret;
    +};
    +
    +static int metricgroup__add_metric_sys_event_iter(struct pmu_event *pe,
    + void *data)
    +{
    + struct metricgroup_add_iter_data *d = data;
    +
    + if (!match_pe_metric(pe, d->metric))
    + return 0;
    +
    + return (*d->ret = metricgroup__add_metric_pmu_event(pe, d->events,
    + d->group_list));
    +}
    +
    static int metricgroup__add_metric(const char *metric, struct strbuf *events,
    struct list_head *group_list)
    {
    struct pmu_events_map *map = perf_pmu__find_map(NULL);
    + struct perf_pmu *pmu = NULL;
    struct pmu_event *pe;
    int i, ret = -EINVAL;

    - if (!map)
    - return 0;
    -
    - for (i = 0; ; i++) {
    + for (i = 0; map; i++) {
    pe = &map->table[i];

    if (!pe->name && !pe->metric_group && !pe->metric_name)
    @@ -618,6 +635,21 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events,
    return ret;
    }
    }
    +
    + while ((pmu = perf_pmu__scan(pmu)) != NULL) {
    + struct metricgroup_iter_data data = {
    + .fn = metricgroup__add_metric_sys_event_iter,
    + .data = (void *) &(struct metricgroup_add_iter_data){
    + .metric = metric,
    + .events = events,
    + .group_list = group_list,
    + .ret = &ret,
    + },
    + };
    +
    + pmu_for_each_sys_event(pmu, metricgroup__sys_event_iter, &data);
    + }
    +
    return ret;
    }

    --
    2.16.4
    \
     
     \ /
      Last update: 2020-04-17 13:11    [W:4.335 / U:0.360 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site