commit 39c391a036f450728bbdc032d4b9fd5c1101e59e
author Adrian Salido <salidoa@google.com> Tue Apr 25 20:57:11 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Apr 25 20:57:11 2017 +0000
tree 715f3f024c258a928abdd3ee36ae25b6bd4081a4
parent 8f88825edbe3cdae01df6bb5483984ba9672fbfc
parent 64cacd753bf0425737bfaf40e55077059c8da6bd

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

Change-Id: I721f131e024f714faa305e4cbd6c62ff6246a538

worker.cpp

diff --git a/worker.cpp b/worker.cpp
index 66ebab3..da6c580 100644
--- a/worker.cpp
+++ b/worker.cpp
@@ -30,6 +30,7 @@
 }
 
 int Worker::InitWorker() {
+  std::lock_guard<std::mutex> lk(mutex_);
   if (initialized())
     return -EALREADY;
 
@@ -42,10 +43,10 @@
 }
 
 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 @@
   if (should_exit())
     ret = -EINTR;
 
-  // release leaves lock unlocked when returning
+  // release leaves mutex locked when going out of scope
   lk.release();
 
   return ret;