1 files changed, 9 insertions, 5 deletions

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 6689378ee577..51ead577533f 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1868,12 +1868,12 @@ static void *perf_evlist__poll_thread(void *arg)
 {
         struct perf_evlist *evlist = arg;
         bool draining = false;
-        int i;
+        int i, done = 0;
+
+        while (!done) {
+                bool got_data = false;
 
-        while (draining || !(evlist->thread.done)) {
-                if (draining)
-                        draining = false;
-                else if (evlist->thread.done)
+                if (evlist->thread.done)
                         draining = true;
 
                 if (!draining)
@@ -1894,9 +1894,13 @@ static void *perf_evlist__poll_thread(void *arg)
                                         pr_warning("cannot locate proper evsel for the side band event\n");
 
                                 perf_mmap__consume(map);
+                                got_data = true;
                         }
                         perf_mmap__read_done(map);
                 }
+
+                if (draining && !got_data)
+                        break;
         }
         return NULL;
 }