---

yaml --- r: 349887 b: refs/heads/master c: 2cfda56 h: refs/heads/master i: 349885: 81169a1 349883: f82c24a 349879: 08da13c 349871: 3f801a7 349855: da5fd17 349823: 74afec1 v: v3
git-mirror · Dec 9, 2012 · a564cca · a564cca
1 parent 868530d
commit a564cca
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5fa9041bbaa7a79a67d568b9c9f947db2f23d091
+refs/heads/master: 2cfda562da7b0b1e0575507ef3efe782d4e218e4
diff --git a/trunk/tools/perf/util/evlist.c b/trunk/tools/perf/util/evlist.c
@@ -111,7 +111,6 @@ void __perf_evlist__set_leader(struct list_head *list)
 	struct perf_evsel *evsel, *leader;
 
 	leader = list_entry(list->next, struct perf_evsel, node);
-	leader->leader = NULL;
 
 	list_for_each_entry(evsel, list, node) {
 		if (evsel != leader)

diff --git a/trunk/tools/perf/util/evsel.c b/trunk/tools/perf/util/evsel.c
@@ -55,6 +55,7 @@ void perf_evsel__init(struct perf_evsel *evsel,
 {
 	evsel->idx	   = idx;
 	evsel->attr	   = *attr;
+	evsel->leader	   = evsel;
 	INIT_LIST_HEAD(&evsel->node);
 	hists__init(&evsel->hists);
 	evsel->sample_size = __perf_evsel__sample_size(attr->sample_type);

diff --git a/trunk/tools/perf/util/evsel.h b/trunk/tools/perf/util/evsel.h
@@ -228,6 +228,6 @@ static inline struct perf_evsel *perf_evsel__next(struct perf_evsel *evsel)
 
 static inline bool perf_evsel__is_group_member(const struct perf_evsel *evsel)
 {
-	return evsel->leader != NULL;
+	return evsel->leader != evsel;
 }
 #endif /* __PERF_EVSEL_H */