drm_hwcomposer: avoid potential race condition between worker init and exit am: ba494c8efc am: d7a6c091e4 am: 884ae6f0d7 am: 64cacd753b

am: 39c391a036

Change-Id: Ibfc45d114fa1f4052b79d9f2ffa175eb6d538158

1 files changed, 5 insertions, 4 deletions

diff --git a/worker.cpp b/worker.cpp
index 66ebab3..da6c580 100644
--- a/worker.cpp
+++ b/worker.cpp
@@ -30,6 +30,7 @@ Worker::~Worker() {
 }
 
 int Worker::InitWorker() {
+  std::lock_guard<std::mutex> lk(mutex_);
   if (initialized())
     return -EALREADY;
 
@@ -42,10 +43,10 @@ int Worker::InitWorker() {
 }
 
 void Worker::Exit() {
+  std::unique_lock<std::mutex> lk(mutex_);
+  exit_ = true;
   if (initialized()) {
-    Lock();
-    exit_ = true;
-    Unlock();
+    lk.unlock();
     cond_.notify_all();
     thread_->join();
     initialized_ = false;
@@ -69,7 +70,7 @@ int Worker::WaitForSignalOrExitLocked(int64_t max_nanoseconds) {
   if (should_exit())
     ret = -EINTR;
 
-  // release leaves lock unlocked when returning
+  // release leaves mutex locked when going out of scope
   lk.release();
 
   return ret;