Clean up PlatformThread.

webrtc/modules/audio_coding/test/APITest.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
@@ skipping 18 matching lines @@
 #include "webrtc/system_wrappers/include/event_wrapper.h"
 #include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/system_wrappers/include/trace.h"
 #include "webrtc/test/testsupport/fileutils.h"
 
 namespace webrtc {
 
 #define TEST_DURATION_SEC 600
 #define NUMBER_OF_SENDER_TESTS 6
 #define MAX_FILE_NAME_LENGTH_BYTE 500
-#define CHECK_THREAD_NULLITY(myThread, S)                                      \
-  if(myThread != NULL) {                                                       \
-    (myThread)->Start();                                                       \
-  } else {                                                                     \
-    ADD_FAILURE() << S;                                                        \
-  }
 
 void APITest::Wait(uint32_t waitLengthMs) {
   if (_randomTest) {
     return;
   } else {
     EventWrapper* myEvent = EventWrapper::Create();
     myEvent->Wait(waitLengthMs);
     delete myEvent;
     return;
   }
@@ skipping 460 matching lines @@
 
   return true;
 }
 
 void APITest::Perform() {
   SetUp();
 
   //--- THREADS
   // A
   // PUSH
-  rtc::scoped_ptr<PlatformThread> myPushAudioThreadA =
-      PlatformThread::CreateThread(PushAudioThreadA, this, "PushAudioThreadA");
-  CHECK_THREAD_NULLITY(myPushAudioThreadA, "Unable to start A::PUSH thread");
+  rtc::PlatformThread myPushAudioThreadA(PushAudioThreadA, this,
+                                         "PushAudioThreadA");
+  myPushAudioThreadA.Start();
   // PULL
-  rtc::scoped_ptr<PlatformThread> myPullAudioThreadA =
-      PlatformThread::CreateThread(PullAudioThreadA, this, "PullAudioThreadA");
-  CHECK_THREAD_NULLITY(myPullAudioThreadA, "Unable to start A::PULL thread");
+  rtc::PlatformThread myPullAudioThreadA(PullAudioThreadA, this,
+                                         "PullAudioThreadA");
+  myPullAudioThreadA.Start();
   // Process
-  rtc::scoped_ptr<PlatformThread> myProcessThreadA =
-      PlatformThread::CreateThread(ProcessThreadA, this, "ProcessThreadA");
-  CHECK_THREAD_NULLITY(myProcessThreadA, "Unable to start A::Process thread");
+  rtc::PlatformThread myProcessThreadA(ProcessThreadA, this, "ProcessThreadA");
+  myProcessThreadA.Start();
   // API
-  rtc::scoped_ptr<PlatformThread> myAPIThreadA =
-      PlatformThread::CreateThread(APIThreadA, this, "APIThreadA");
-  CHECK_THREAD_NULLITY(myAPIThreadA, "Unable to start A::API thread");
+  rtc::PlatformThread myAPIThreadA(APIThreadA, this, "APIThreadA");
+  myAPIThreadA.Start();
   // B
   // PUSH
-  rtc::scoped_ptr<PlatformThread> myPushAudioThreadB =
-      PlatformThread::CreateThread(PushAudioThreadB, this, "PushAudioThreadB");
-  CHECK_THREAD_NULLITY(myPushAudioThreadB, "Unable to start B::PUSH thread");
+  rtc::PlatformThread myPushAudioThreadB(PushAudioThreadB, this,
+                                         "PushAudioThreadB");
+  myPushAudioThreadB.Start();
   // PULL
-  rtc::scoped_ptr<PlatformThread> myPullAudioThreadB =
-      PlatformThread::CreateThread(PullAudioThreadB, this, "PullAudioThreadB");
-  CHECK_THREAD_NULLITY(myPullAudioThreadB, "Unable to start B::PULL thread");
+  rtc::PlatformThread myPullAudioThreadB(PullAudioThreadB, this,
+                                         "PullAudioThreadB");
+  myPullAudioThreadB.Start();
   // Process
-  rtc::scoped_ptr<PlatformThread> myProcessThreadB =
-      PlatformThread::CreateThread(ProcessThreadB, this, "ProcessThreadB");
-  CHECK_THREAD_NULLITY(myProcessThreadB, "Unable to start B::Process thread");
+  rtc::PlatformThread myProcessThreadB(ProcessThreadB, this, "ProcessThreadB");
+  myProcessThreadB.Start();
   // API
-  rtc::scoped_ptr<PlatformThread> myAPIThreadB =
-      PlatformThread::CreateThread(APIThreadB, this, "APIThreadB");
-  CHECK_THREAD_NULLITY(myAPIThreadB, "Unable to start B::API thread");
+  rtc::PlatformThread myAPIThreadB(APIThreadB, this, "APIThreadB");
+  myAPIThreadB.Start();
 
   //_apiEventA->StartTimer(true, 5000);
   //_apiEventB->StartTimer(true, 5000);
 
   _processEventA->StartTimer(true, 10);
   _processEventB->StartTimer(true, 10);
 
   _pullEventA->StartTimer(true, 10);
   _pullEventB->StartTimer(true, 10);
 
@@ skipping 13 matching lines @@
     }
     //fflush(stderr);
     completeEvent->Wait(50);
     currentTime = TickTime::MillisecondTimestamp();
   } while ((currentTime - startTime) < 120000);
 
   //completeEvent->Wait(0xFFFFFFFF);
   //(unsigned long)((unsigned long)TEST_DURATION_SEC * (unsigned long)1000));
   delete completeEvent;
 
-  myPushAudioThreadA->Stop();
-  myPullAudioThreadA->Stop();
-  myProcessThreadA->Stop();
-  myAPIThreadA->Stop();
+  myPushAudioThreadA.Stop();
+  myPullAudioThreadA.Stop();
+  myProcessThreadA.Stop();
+  myAPIThreadA.Stop();
 
-  myPushAudioThreadB->Stop();
-  myPullAudioThreadB->Stop();
-  myProcessThreadB->Stop();
-  myAPIThreadB->Stop();
+  myPushAudioThreadB.Stop();
+  myPullAudioThreadB.Stop();
+  myProcessThreadB.Stop();
+  myAPIThreadB.Stop();
 }
 
 void APITest::CheckVADStatus(char side) {
 
   bool dtxEnabled;
   bool vadEnabled;
   ACMVADMode vadMode;
 
   if (side == 'A') {
     _acmA->VAD(&dtxEnabled, &vadEnabled, &vadMode);
@@ skipping 496 matching lines @@
   CHECK_ERROR_MT(myACM->RegisterSendCodec(myCodec));
   myChannel->ResetStats();
   {
     WriteLockScoped wl(_apiTestRWLock);
     *thereIsEncoder = true;
   }
   Wait(500);
 }
 
 }  // namespace webrtc