commit 82ead60076bbe74b47f2491a1af6e09c7641dec4
author tommi <tommi@webrtc.org> Sun Feb 19 16:09:55 2017 -0800
committer Commit bot <commit-bot@chromium.org> Mon Feb 20 00:09:55 2017 +0000
tree a91ae72fc9fa7bc60d8c47331dac0639155d46cb
parent d95c48a810e8685127a9a02ce9a66d7f3e5027d7

Replace the stop_event_ in PlatformThread with an atomic flag

BUG=webrtc:7187

Review-Url: https://codereview.webrtc.org/2708433002
Cr-Commit-Position: refs/heads/master@{#16705}

webrtc/base/platform_thread.cc

diff --git a/webrtc/base/platform_thread.cc b/webrtc/base/platform_thread.cc
index 0b025f2..d1bd509 100644
--- a/webrtc/base/platform_thread.cc
+++ b/webrtc/base/platform_thread.cc
@@ -10,6 +10,7 @@
 
 #include "webrtc/base/platform_thread.h"
 
+#include "webrtc/base/atomicops.h"
 #include "webrtc/base/checks.h"
 
 #if defined(WEBRTC_LINUX)
@@ -96,15 +97,7 @@
                                const char* thread_name)
     : run_function_(func),
       obj_(obj),
-      name_(thread_name ? thread_name : "webrtc"),
-#if defined(WEBRTC_WIN)
-      stop_(false),
-      thread_(NULL),
-      thread_id_(0) {
-#else
-      stop_event_(false, false),
-      thread_(0) {
-#endif  // defined(WEBRTC_WIN)
+      name_(thread_name ? thread_name : "webrtc") {
   RTC_DCHECK(func);
   RTC_DCHECK(name_.length() < 64);
 }
@@ -187,15 +180,26 @@
   thread_ = nullptr;
   thread_id_ = 0;
 #else
-  stop_event_.Set();
+  RTC_CHECK_EQ(1, AtomicOps::Increment(&stop_flag_));
   RTC_CHECK_EQ(0, pthread_join(thread_, nullptr));
+  AtomicOps::ReleaseStore(&stop_flag_, 0);
   thread_ = 0;
 #endif  // defined(WEBRTC_WIN)
 }
 
+// TODO(tommi): Deprecate the loop behavior in PlatformThread.
+// * Introduce a new callback type that returns void.
+// * Remove potential for a busy loop in PlatformThread.
+// * Delegate the responsibility for how to stop the thread, to the
+//   implementation that actually uses the thread.
+// All implementations will need to be aware of how the thread should be stopped
+// and encouraging a busy polling loop, can be costly in terms of power and cpu.
 void PlatformThread::Run() {
   if (!name_.empty())
     rtc::SetCurrentThreadName(name_.c_str());
+#if !defined(WEBRTC_MAC) && !defined(WEBRTC_WIN)
+  const struct timespec ts_null = {0};
+#endif
   do {
     // The interface contract of Start/Stop is that for a successful call to
     // Start, there should be at least one call to the run function.  So we
@@ -207,7 +211,12 @@
     SleepEx(0, true);
   } while (!stop_);
 #else
-  } while (!stop_event_.Wait(0));
+#if defined(WEBRTC_MAC)
+    sched_yield();
+#else
+    nanosleep(&ts_null, nullptr);
+#endif
+  } while (!AtomicOps::AcquireLoad(&stop_flag_));
 #endif  // defined(WEBRTC_WIN)
 }