tools: rename bitmap_alloc() to bitmap_zalloc()

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

diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index 0158d29..563dec7 100644 (file)
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -278,7 +278,7 @@ static int do_read_bitmap(struct feat_fd *ff, unsigned long **pset, u64 *psize)
        if (ret)
                return ret;
 
-       set = bitmap_alloc(size);
+       set = bitmap_zalloc(size);
        if (!set)
                return -ENOMEM;
 
@@ -778,7 +778,7 @@ static int write_pmu_mappings(struct feat_fd *ff,
 static int write_group_desc(struct feat_fd *ff,
                            struct evlist *evlist)
 {
-       u32 nr_groups = evlist->nr_groups;
+       u32 nr_groups = evlist->core.nr_groups;
        struct evsel *evsel;
        int ret;
 
@@ -789,7 +789,7 @@ static int write_group_desc(struct feat_fd *ff,
        evlist__for_each_entry(evlist, evsel) {
                if (evsel__is_group_leader(evsel) && evsel->core.nr_members > 1) {
                        const char *name = evsel->group_name ?: "{anon_group}";
-                       u32 leader_idx = evsel->idx;
+                       u32 leader_idx = evsel->core.idx;
                        u32 nr_members = evsel->core.nr_members;
 
                        ret = do_write_string(ff, name);
@@ -1294,7 +1294,7 @@ static int memory_node__read(struct memory_node *n, unsigned long idx)
 
        size++;
 
-       n->set = bitmap_alloc(size);
+       n->set = bitmap_zalloc(size);
        if (!n->set) {
                closedir(dir);
                return -ENOMEM;
@@ -1844,7 +1844,7 @@ static struct evsel *read_event_desc(struct feat_fd *ff)
                msz = sz;
 
        for (i = 0, evsel = events; i < nre; evsel++, i++) {
-               evsel->idx = i;
+               evsel->core.idx = i;
 
                /*
                 * must read entire on-file attr struct to
@@ -2379,7 +2379,7 @@ static struct evsel *evlist__find_by_index(struct evlist *evlist, int idx)
        struct evsel *evsel;
 
        evlist__for_each_entry(evlist, evsel) {
-               if (evsel->idx == idx)
+               if (evsel->core.idx == idx)
                        return evsel;
        }
 
@@ -2393,7 +2393,7 @@ static void evlist__set_event_name(struct evlist *evlist, struct evsel *event)
        if (!event->name)
                return;
 
-       evsel = evlist__find_by_index(evlist, event->idx);
+       evsel = evlist__find_by_index(evlist, event->core.idx);
        if (!evsel)
                return;
 
@@ -2735,12 +2735,12 @@ static int process_group_desc(struct feat_fd *ff, void *data __maybe_unused)
         * Rebuild group relationship based on the group_desc
         */
        session = container_of(ff->ph, struct perf_session, header);
-       session->evlist->nr_groups = nr_groups;
+       session->evlist->core.nr_groups = nr_groups;
 
        i = nr = 0;
        evlist__for_each_entry(session->evlist, evsel) {
-               if (evsel->idx == (int) desc[i].leader_idx) {
-                       evsel->leader = evsel;
+               if (evsel->core.idx == (int) desc[i].leader_idx) {
+                       evsel__set_leader(evsel, evsel);
                        /* {anon_group} is a dummy name */
                        if (strcmp(desc[i].name, "{anon_group}")) {
                                evsel->group_name = desc[i].name;
@@ -2758,7 +2758,7 @@ static int process_group_desc(struct feat_fd *ff, void *data __maybe_unused)
                        i++;
                } else if (nr) {
                        /* This is a group member */
-                       evsel->leader = leader;
+                       evsel__set_leader(evsel, leader);
 
                        nr--;
                }