commit cfd929dffd2f9f0bdc6997f06309992000fbc289
author John Reck <jreck@google.com> Mon Apr 08 11:28:15 2019 -0700
committer John Reck <jreck@google.com> Mon Apr 08 16:30:22 2019 -0700
tree a948b796f349c581b3d5d3c41c496396d2ca48a2
parent a39c85fc2b563e628a4fd197b4a8b0d0ba86ec43

Revert "Revert "Fix lifecycle issue in CommonPool""

This reverts commit 162305aaceca5f6cbaa03db1aa124f67e313612e.

Adjusted tests to ensure they pass on cf_x86

Bug: 129250875
Test: this on cf_x86 & blueline

Change-Id: Ic3245ec8db784ae356b7fa66dda9a2fc91c622ea

libs/hwui/thread/CommonPool.h

diff --git a/libs/hwui/thread/CommonPool.h b/libs/hwui/thread/CommonPool.h
index aef2990..7603eee 100644
--- a/libs/hwui/thread/CommonPool.h
+++ b/libs/hwui/thread/CommonPool.h
@@ -57,11 +57,13 @@
         mHead = newHead;
     }
 
-    constexpr T&& pop() {
+    constexpr T pop() {
         LOG_ALWAYS_FATAL_IF(mTail == mHead, "empty");
         int index = mTail;
         mTail = (mTail + 1) % SIZE;
-        return std::move(mBuffer[index]);
+        T ret = std::move(mBuffer[index]);
+        mBuffer[index] = nullptr;
+        return ret;
     }
 
 private:
@@ -95,11 +97,17 @@
         return task.get_future().get();
     };
 
+    // For testing purposes only, blocks until all worker threads are parked.
+    static void waitForIdle();
+
 private:
+    static CommonPool& instance();
+
     CommonPool();
     ~CommonPool() {}
 
     void enqueue(Task&&);
+    void doWaitForIdle();
 
     void workerLoop();