tools: rename bitmap_alloc() to bitmap_zalloc()

[linux-2.6-microblaze.git] / tools / perf / util / metricgroup.c

diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
index d3cf2de..29b747a 100644 (file)
--- a/tools/perf/util/metricgroup.c
+++ b/tools/perf/util/metricgroup.c
@@ -219,9 +219,9 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
                if (has_constraint && ev->weak_group)
                        continue;
                /* Ignore event if already used and merging is disabled. */
-               if (metric_no_merge && test_bit(ev->idx, evlist_used))
+               if (metric_no_merge && test_bit(ev->core.idx, evlist_used))
                        continue;
-               if (!has_constraint && ev->leader != current_leader) {
+               if (!has_constraint && !evsel__has_leader(ev, current_leader)) {
                        /*
                         * Start of a new group, discard the whole match and
                         * start again.
@@ -229,7 +229,7 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
                        matched_events = 0;
                        memset(metric_events, 0,
                                sizeof(struct evsel *) * idnum);
-                       current_leader = ev->leader;
+                       current_leader = evsel__leader(ev);
                }
                /*
                 * Check for duplicate events with the same name. For example,
@@ -269,7 +269,7 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
        for (i = 0; i < idnum; i++) {
                ev = metric_events[i];
                /* Don't free the used events. */
-               set_bit(ev->idx, evlist_used);
+               set_bit(ev->core.idx, evlist_used);
                /*
                 * The metric leader points to the identically named event in
                 * metric_events.
@@ -287,11 +287,11 @@ static struct evsel *find_evsel_group(struct evlist *perf_evlist,
                         * when then group is left.
                         */
                        if (!has_constraint &&
-                           ev->leader != metric_events[i]->leader &&
-                           evsel_same_pmu_or_none(ev->leader, metric_events[i]->leader))
+                           ev->core.leader != metric_events[i]->core.leader &&
+                           evsel_same_pmu_or_none(evsel__leader(ev), evsel__leader(metric_events[i])))
                                break;
                        if (!strcmp(metric_events[i]->name, ev->name)) {
-                               set_bit(ev->idx, evlist_used);
+                               set_bit(ev->core.idx, evlist_used);
                                ev->metric_leader = metric_events[i];
                        }
                }
@@ -313,7 +313,7 @@ static int metricgroup__setup_events(struct list_head *groups,
        struct evsel *evsel, *tmp;
        unsigned long *evlist_used;
 
-       evlist_used = bitmap_alloc(perf_evlist->core.nr_entries);
+       evlist_used = bitmap_zalloc(perf_evlist->core.nr_entries);
        if (!evlist_used)
                return -ENOMEM;
 
@@ -391,7 +391,7 @@ static int metricgroup__setup_events(struct list_head *groups,
        }
 
        evlist__for_each_entry_safe(perf_evlist, tmp, evsel) {
-               if (!test_bit(evsel->idx, evlist_used)) {
+               if (!test_bit(evsel->core.idx, evlist_used)) {
                        evlist__remove(perf_evlist, evsel);
                        evsel__delete(evsel);
                }
@@ -1312,7 +1312,7 @@ int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *cgrp,
                nd = rblist__entry(old_metric_events, i);
                old_me = container_of(nd, struct metric_event, nd);
 
-               evsel = evlist__find_evsel(evlist, old_me->evsel->idx);
+               evsel = evlist__find_evsel(evlist, old_me->evsel->core.idx);
                if (!evsel)
                        return -EINVAL;
                new_me = metricgroup__lookup(new_metric_events, evsel, true);
@@ -1320,7 +1320,7 @@ int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *cgrp,
                        return -ENOMEM;
 
                pr_debug("copying metric event for cgroup '%s': %s (idx=%d)\n",
-                        cgrp ? cgrp->name : "root", evsel->name, evsel->idx);
+                        cgrp ? cgrp->name : "root", evsel->name, evsel->core.idx);
 
                list_for_each_entry(old_expr, &old_me->head, nd) {
                        new_expr = malloc(sizeof(*new_expr));
@@ -1363,7 +1363,7 @@ int metricgroup__copy_metric_events(struct evlist *evlist, struct cgroup *cgrp,
                        /* copy evsel in the same position */
                        for (idx = 0; idx < nr; idx++) {
                                evsel = old_expr->metric_events[idx];
-                               evsel = evlist__find_evsel(evlist, evsel->idx);
+                               evsel = evlist__find_evsel(evlist, evsel->core.idx);
                                if (evsel == NULL) {
                                        free(new_expr->metric_events);
                                        free(new_expr->metric_refs);