Add Darwin thread.h implementation.

webrtc/base/thread.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include "webrtc/base/thread.h"
 
 #if defined(WEBRTC_WIN)
 #include <comdef.h>
 #elif defined(WEBRTC_POSIX)
 #include <time.h>
 #endif
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/base/nullsocketserver.h"
 #include "webrtc/base/platform_thread.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/base/trace_event.h"
 
-#if defined(WEBRTC_MAC)
-#include "webrtc/base/maccocoathreadhelper.h"
-#include "webrtc/base/scoped_autorelease_pool.h"
-#endif
-
 namespace rtc {
 
 ThreadManager* ThreadManager::Instance() {
   RTC_DEFINE_STATIC_LOCAL(ThreadManager, thread_manager, ());
   return &thread_manager;
 }
 
 // static
 Thread* Thread::Current() {
   return ThreadManager::Instance()->CurrentThread();
 }
 
 #if defined(WEBRTC_POSIX)
+#if !defined(WEBRTC_MAC)
 ThreadManager::ThreadManager() {
   pthread_key_create(&key_, nullptr);
 #ifndef NO_MAIN_THREAD_WRAPPING
   WrapCurrentThread();
 #endif
-#if defined(WEBRTC_MAC)
-  // This is necessary to alert the cocoa runtime of the fact that
-  // we are running in a multithreaded environment.
-  InitCocoaMultiThreading();
-#endif
 }
 
 ThreadManager::~ThreadManager() {
-#if defined(WEBRTC_MAC)
-  // This is called during exit, at which point apparently no NSAutoreleasePools
-  // are available; but we might still need them to do cleanup (or we get the
-  // "no autoreleasepool in place, just leaking" warning when exiting).
-  ScopedAutoreleasePool pool;
-#endif
   UnwrapCurrentThread();
   pthread_key_delete(key_);
 }
+#endif
 
 Thread *ThreadManager::CurrentThread() {
   return static_cast<Thread *>(pthread_getspecific(key_));
 }
 
 void ThreadManager::SetCurrentThread(Thread *thread) {
   pthread_setspecific(key_, thread);
 }
 #endif
 
@@ skipping 29 matching lines @@
 }
 
 void ThreadManager::UnwrapCurrentThread() {
   Thread* t = CurrentThread();
   if (t && !(t->IsOwned())) {
     t->UnwrapCurrent();
     delete t;
   }
 }
 
-struct ThreadInit {
-  Thread* thread;
-  Runnable* runnable;
-};
-
 Thread::ScopedDisallowBlockingCalls::ScopedDisallowBlockingCalls()
   : thread_(Thread::Current()),
     previous_state_(thread_->SetAllowBlockingCalls(false)) {
 }
 
 Thread::ScopedDisallowBlockingCalls::~ScopedDisallowBlockingCalls() {
   RTC_DCHECK(thread_->IsCurrent());
   thread_->SetAllowBlockingCalls(previous_state_);
 }
 
@@ skipping 160 matching lines @@
 
 // static
 void Thread::AssertBlockingIsAllowedOnCurrentThread() {
 #if !defined(NDEBUG)
   Thread* current = Thread::Current();
   RTC_DCHECK(!current || current->blocking_calls_allowed_);
 #endif
 }
 
 // static
+#if !defined(WEBRTC_MAC)
 #if defined(WEBRTC_WIN)
 DWORD WINAPI Thread::PreRun(LPVOID pv) {
 #else
 void* Thread::PreRun(void* pv) {
 #endif
   ThreadInit* init = static_cast<ThreadInit*>(pv);
   ThreadManager::Instance()->SetCurrentThread(init->thread);
   rtc::SetCurrentThreadName(init->thread->name_.c_str());
-#if defined(WEBRTC_MAC)
-  // Make sure the new thread has an autoreleasepool
-  ScopedAutoreleasePool pool;
-#endif
   if (init->runnable) {
     init->runnable->Run(init->thread);
   } else {
     init->thread->Run();
   }
   delete init;
 #ifdef WEBRTC_WIN
   return 0;
 #else
   return nullptr;
 #endif
 }
+#endif
 
 void Thread::Run() {
   ProcessMessages(kForever);
 }
 
 bool Thread::IsOwned() {
   return owned_;
 }
 
 void Thread::Stop() {
@@ skipping 136 matching lines @@
       *smsg.ready = true;
       smsg.thread->socketserver()->WakeUp();
       continue;
     }
     ++iter;
   }
 
   MessageQueue::Clear(phandler, id, removed);
 }
 
+#if !defined(WEBRTC_MAC)
+// Note that these methods have a separate implementation for mac and ios
+// defined in webrtc/base/thread_darwin.mm.
 bool Thread::ProcessMessages(int cmsLoop) {
   int64_t msEnd = (kForever == cmsLoop) ? 0 : TimeAfter(cmsLoop);
   int cmsNext = cmsLoop;
 
   while (true) {
-#if defined(WEBRTC_MAC)
-    // see: http://developer.apple.com/library/mac/#documentation/Cocoa/Reference/Foundation/Classes/NSAutoreleasePool_Class/Reference/Reference.html
-    // Each thread is supposed to have an autorelease pool. Also for event loops
-    // like this, autorelease pool needs to be created and drained/released
-    // for each cycle.
-    ScopedAutoreleasePool pool;
-#endif
     Message msg;
     if (!Get(&msg, cmsNext))
       return !IsQuitting();
     Dispatch(&msg);
 
     if (cmsLoop != kForever) {
       cmsNext = static_cast<int>(TimeUntil(msEnd));
       if (cmsNext < 0)
         return true;
     }
   }
 }
+#endif
 
 bool Thread::WrapCurrentWithThreadManager(ThreadManager* thread_manager,
                                           bool need_synchronize_access) {
   if (running())
     return false;
 
 #if defined(WEBRTC_WIN)
   if (need_synchronize_access) {
     // We explicitly ask for no rights other than synchronization.
     // This gives us the best chance of succeeding.
@@ skipping 38 matching lines @@
   if (SUCCEEDED(hr)) {
     Thread::Run();
     CoUninitialize();
   } else {
     LOG(LS_ERROR) << "CoInitialize failed, hr=" << hr;
   }
 }
 #endif
 
 }  // namespace rtc