libperf: Move 'idx' from tools/perf to perf_evsel::idx

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

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 6ba9664..6563ce3 100644 (file)
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -165,11 +165,9 @@ void evlist__delete(struct evlist *evlist)
 
 void evlist__add(struct evlist *evlist, struct evsel *entry)
 {
-       entry->evlist = evlist;
-       entry->idx = evlist->core.nr_entries;
-       entry->tracking = !entry->idx;
-
        perf_evlist__add(&evlist->core, &entry->core);
+       entry->evlist = evlist;
+       entry->tracking = !entry->core.idx;
 
        if (evlist->core.nr_entries == 1)
                evlist__set_id_pos(evlist);
@@ -232,7 +230,7 @@ void __evlist__set_leader(struct list_head *list)
        leader = list_entry(list->next, struct evsel, core.node);
        evsel = list_entry(list->prev, struct evsel, core.node);
 
-       leader->core.nr_members = evsel->idx - leader->idx + 1;
+       leader->core.nr_members = evsel->core.idx - leader->core.idx + 1;
 
        __evlist__for_each_entry(list, evsel) {
                evsel->leader = leader;
@@ -2137,7 +2135,7 @@ struct evsel *evlist__find_evsel(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;
        }
        return NULL;