[PATCH RFC v5 08/13] perf evlist: Change perf_evlist__splice_list_tail() ordering

[John Garry]

Function find_evsel_group() expects events to be ordered such that they
are grouped after their leader.

Modify perf_evlist__splice_list_tail() to guarantee this (ordering).

[Should prob also change the function name]

Signed-off-by: John Garry <john.ga...@huawei.com>
---
 tools/perf/util/evlist.c | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 8bdf3d2c907c..b7e4e6d85d59 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -180,11 +180,22 @@ void evlist__remove(struct evlist *evlist, struct evsel 
*evsel)
 void perf_evlist__splice_list_tail(struct evlist *evlist,
                                   struct list_head *list)
 {
-       struct evsel *evsel, *temp;
+       while (!list_empty(list)) {
+               struct evsel *evsel, *temp, *leader = NULL;
 
-       __evlist__for_each_entry_safe(list, temp, evsel) {
-               list_del_init(&evsel->core.node);
-               evlist__add(evlist, evsel);
+               __evlist__for_each_entry_safe(list, temp, evsel) {
+                       list_del_init(&evsel->core.node);
+                       evlist__add(evlist, evsel);
+                       leader = evsel;
+                       break;
+               }
+
+               __evlist__for_each_entry_safe(list, temp, evsel) {
+                       if (evsel->leader == leader) {
+                               list_del_init(&evsel->core.node);
+                               evlist__add(evlist, evsel);
+                       }
+               }
        }
 }
 
-- 
2.26.2