commit 32c361cd991a296d6297156aa37bb9014d485073
author Kaiyi Li <kaiyili@google.com> Fri Oct 07 11:29:26 2022 -0700
committer Kaiyi Li <kaiyili@google.com> Fri Oct 14 13:27:55 2022 -0700
tree 78f91a787267628aeceacde98b9c442e654a3641
parent 32281f7dcd59ab2964d63fca583e75bb53bf7722

Use WorkerThread to implement ProcessCleanupThread

... so that later we can send `std::unique_ptr` to the worker thread.

Change-Id: Ie380b4689013fd8c8af33b8ddc1ae8dea81e0999

stream-servers/RendererImpl.cpp

diff --git a/stream-servers/RendererImpl.cpp b/stream-servers/RendererImpl.cpp
index fd63717..3a96ea8 100644
--- a/stream-servers/RendererImpl.cpp
+++ b/stream-servers/RendererImpl.cpp
@@ -17,12 +17,14 @@
 
 #include <algorithm>
 #include <utility>
+#include <variant>
 
 #include "FenceSync.h"
 #include "FrameBuffer.h"
 #include "RenderChannelImpl.h"
 #include "RenderThread.h"
 #include "aemu/base/system/System.h"
+#include "aemu/base/threads/WorkerThread.h"
 #include "host-common/logging.h"
 #include "snapshot/common.h"
 
@@ -56,36 +58,47 @@
 class RendererImpl::ProcessCleanupThread {
 public:
     ProcessCleanupThread()
-        : mCleanupThread([this]() {
-              while (const auto id = mCleanupProcessIds.receive()) {
-                  FrameBuffer::getFB()->cleanupProcGLObjects(*id);
-              }
+        : mCleanupWorker([](Cmd cmd) {
+            using android::base::WorkerProcessingResult;
+            struct {
+                WorkerProcessingResult operator()(CleanProcessResources resources) {
+                    FrameBuffer::getFB()->cleanupProcGLObjects(resources.puid);
+                    return WorkerProcessingResult::Continue;
+                }
+                WorkerProcessingResult operator()(Exit) {
+                    return WorkerProcessingResult::Stop;
+                }
+            } visitor;
+            return std::visit(visitor, std::move(cmd));
           }) {
-        mCleanupThread.start();
+        mCleanupWorker.start();
     }
 
     ~ProcessCleanupThread() {
-        mCleanupProcessIds.stop();
-        mCleanupThread.wait();
+        mCleanupWorker.enqueue(Exit{});
     }
 
     void cleanup(uint64_t processId) {
-        mCleanupProcessIds.send(processId);
+        mCleanupWorker.enqueue(CleanProcessResources{.puid = processId});
     }
 
     void stop() {
-        mCleanupProcessIds.stop();
+        mCleanupWorker.enqueue(Exit{});
     }
 
     void waitForCleanup() {
-        mCleanupProcessIds.waitForEmpty();
+        mCleanupWorker.waitQueuedItems();
     }
 
 private:
+    struct CleanProcessResources {
+        uint64_t puid;
+    };
+    struct Exit {};
+    using Cmd = std::variant<CleanProcessResources, Exit>;
     DISALLOW_COPY_AND_ASSIGN(ProcessCleanupThread);
 
-    android::base::MessageChannel<uint64_t, 64> mCleanupProcessIds;
-    android::base::FunctorThread mCleanupThread;
+    android::base::WorkerThread<Cmd> mCleanupWorker;
 };
 
 RendererImpl::RendererImpl() {