- Add a SetPriority method to ThreadWrapper
- Remove 'priority' from CreateThread and related member variables from implementations
- Make supplying a name for threads, non-optional
BUG=
R=magjed@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/44729004
Cr-Commit-Position: refs/heads/master@{#8810}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8810 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc
index 17be285..a600129 100644
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest.cc
@@ -285,18 +285,11 @@
AudioCodingModuleMtTest()
: AudioCodingModuleTest(),
- send_thread_(ThreadWrapper::CreateThread(CbSendThread,
- this,
- kRealtimePriority,
- "send")),
- insert_packet_thread_(ThreadWrapper::CreateThread(CbInsertPacketThread,
- this,
- kRealtimePriority,
- "insert_packet")),
- pull_audio_thread_(ThreadWrapper::CreateThread(CbPullAudioThread,
- this,
- kRealtimePriority,
- "pull_audio")),
+ send_thread_(ThreadWrapper::CreateThread(CbSendThread, this, "send")),
+ insert_packet_thread_(ThreadWrapper::CreateThread(
+ CbInsertPacketThread, this, "insert_packet")),
+ pull_audio_thread_(ThreadWrapper::CreateThread(
+ CbPullAudioThread, this, "pull_audio")),
test_complete_(EventWrapper::Create()),
send_count_(0),
insert_packet_count_(0),
@@ -315,8 +308,11 @@
void StartThreads() {
ASSERT_TRUE(send_thread_->Start());
+ send_thread_->SetPriority(kRealtimePriority);
ASSERT_TRUE(insert_packet_thread_->Start());
+ insert_packet_thread_->SetPriority(kRealtimePriority);
ASSERT_TRUE(pull_audio_thread_->Start());
+ pull_audio_thread_->SetPriority(kRealtimePriority);
}
void TearDown() override {
diff --git a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc
index 829db2d..c083f28 100644
--- a/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc
+++ b/webrtc/modules/audio_coding/main/acm2/audio_coding_module_unittest_oldapi.cc
@@ -462,18 +462,11 @@
AudioCodingModuleMtTestOldApi()
: AudioCodingModuleTestOldApi(),
- send_thread_(ThreadWrapper::CreateThread(CbSendThread,
- this,
- kRealtimePriority,
- "send")),
- insert_packet_thread_(ThreadWrapper::CreateThread(CbInsertPacketThread,
- this,
- kRealtimePriority,
- "insert_packet")),
- pull_audio_thread_(ThreadWrapper::CreateThread(CbPullAudioThread,
- this,
- kRealtimePriority,
- "pull_audio")),
+ send_thread_(ThreadWrapper::CreateThread(CbSendThread, this, "send")),
+ insert_packet_thread_(ThreadWrapper::CreateThread(
+ CbInsertPacketThread, this, "insert_packet")),
+ pull_audio_thread_(ThreadWrapper::CreateThread(
+ CbPullAudioThread, this, "pull_audio")),
test_complete_(EventWrapper::Create()),
send_count_(0),
insert_packet_count_(0),
@@ -492,8 +485,11 @@
void StartThreads() {
ASSERT_TRUE(send_thread_->Start());
+ send_thread_->SetPriority(kRealtimePriority);
ASSERT_TRUE(insert_packet_thread_->Start());
+ insert_packet_thread_->SetPriority(kRealtimePriority);
ASSERT_TRUE(pull_audio_thread_->Start());
+ pull_audio_thread_->SetPriority(kRealtimePriority);
}
void TearDown() {
diff --git a/webrtc/modules/audio_coding/main/test/APITest.cc b/webrtc/modules/audio_coding/main/test/APITest.cc
index 83b24a8..8cfe0e3 100644
--- a/webrtc/modules/audio_coding/main/test/APITest.cc
+++ b/webrtc/modules/audio_coding/main/test/APITest.cc
@@ -532,40 +532,36 @@
// A
// PUSH
rtc::scoped_ptr<ThreadWrapper> myPushAudioThreadA =
- ThreadWrapper::CreateThread(PushAudioThreadA, this, kNormalPriority,
- "PushAudioThreadA");
+ ThreadWrapper::CreateThread(PushAudioThreadA, this, "PushAudioThreadA");
CHECK_THREAD_NULLITY(myPushAudioThreadA, "Unable to start A::PUSH thread");
// PULL
rtc::scoped_ptr<ThreadWrapper> myPullAudioThreadA =
- ThreadWrapper::CreateThread(PullAudioThreadA, this, kNormalPriority,
- "PullAudioThreadA");
+ ThreadWrapper::CreateThread(PullAudioThreadA, this, "PullAudioThreadA");
CHECK_THREAD_NULLITY(myPullAudioThreadA, "Unable to start A::PULL thread");
// Process
rtc::scoped_ptr<ThreadWrapper> myProcessThreadA = ThreadWrapper::CreateThread(
- ProcessThreadA, this, kNormalPriority, "ProcessThreadA");
+ ProcessThreadA, this, "ProcessThreadA");
CHECK_THREAD_NULLITY(myProcessThreadA, "Unable to start A::Process thread");
// API
rtc::scoped_ptr<ThreadWrapper> myAPIThreadA = ThreadWrapper::CreateThread(
- APIThreadA, this, kNormalPriority, "APIThreadA");
+ APIThreadA, this, "APIThreadA");
CHECK_THREAD_NULLITY(myAPIThreadA, "Unable to start A::API thread");
// B
// PUSH
rtc::scoped_ptr<ThreadWrapper> myPushAudioThreadB =
- ThreadWrapper::CreateThread(PushAudioThreadB, this, kNormalPriority,
- "PushAudioThreadB");
+ ThreadWrapper::CreateThread(PushAudioThreadB, this, "PushAudioThreadB");
CHECK_THREAD_NULLITY(myPushAudioThreadB, "Unable to start B::PUSH thread");
// PULL
rtc::scoped_ptr<ThreadWrapper> myPullAudioThreadB =
- ThreadWrapper::CreateThread(PullAudioThreadB, this, kNormalPriority,
- "PullAudioThreadB");
+ ThreadWrapper::CreateThread(PullAudioThreadB, this, "PullAudioThreadB");
CHECK_THREAD_NULLITY(myPullAudioThreadB, "Unable to start B::PULL thread");
// Process
rtc::scoped_ptr<ThreadWrapper> myProcessThreadB = ThreadWrapper::CreateThread(
- ProcessThreadB, this, kNormalPriority, "ProcessThreadB");
+ ProcessThreadB, this, "ProcessThreadB");
CHECK_THREAD_NULLITY(myProcessThreadB, "Unable to start B::Process thread");
// API
rtc::scoped_ptr<ThreadWrapper> myAPIThreadB = ThreadWrapper::CreateThread(
- APIThreadB, this, kNormalPriority, "APIThreadB");
+ APIThreadB, this, "APIThreadB");
CHECK_THREAD_NULLITY(myAPIThreadB, "Unable to start B::API thread");
//_apiEventA->StartTimer(true, 5000);