0f8b403eb5
The new constructor introduces two new changes:
* Support specifying thread priority at construction time.
- Moving forward, the SetPriority() method will be removed.
* New thread function type.
- The new type has 'void' as a return type and a polling loop
inside PlatformThread, is not used.
The old function type is still supported until all places have been moved over.
In this CL, the first steps towards deprecating the old mechanism are taken
by moving parts of the code that were simple to move, over to the new callback
type.
BUG=webrtc:7187
Review-Url: https://codereview.webrtc.org/2708723003
Cr-Commit-Position: refs/heads/master@{#16779}
112 lines
3.3 KiB
C++
112 lines
3.3 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#include "webrtc/base/platform_thread.h"
|
|
|
|
#include "webrtc/system_wrappers/include/sleep.h"
|
|
#include "webrtc/test/gtest.h"
|
|
|
|
namespace rtc {
|
|
namespace {
|
|
// Function that does nothing, and reports success.
|
|
bool NullRunFunctionDeprecated(void* obj) {
|
|
webrtc::SleepMs(0); // Hand over timeslice, prevents busy looping.
|
|
return true;
|
|
}
|
|
|
|
void NullRunFunction(void* obj) {}
|
|
|
|
// Function that sets a boolean.
|
|
bool SetFlagRunFunctionDeprecated(void* obj) {
|
|
bool* obj_as_bool = static_cast<bool*>(obj);
|
|
*obj_as_bool = true;
|
|
webrtc::SleepMs(0); // Hand over timeslice, prevents busy looping.
|
|
return true;
|
|
}
|
|
|
|
void SetFlagRunFunction(void* obj) {
|
|
bool* obj_as_bool = static_cast<bool*>(obj);
|
|
*obj_as_bool = true;
|
|
}
|
|
|
|
} // namespace
|
|
|
|
TEST(PlatformThreadTest, StartStopDeprecated) {
|
|
PlatformThread thread(&NullRunFunctionDeprecated, nullptr,
|
|
"PlatformThreadTest");
|
|
EXPECT_TRUE(thread.name() == "PlatformThreadTest");
|
|
EXPECT_TRUE(thread.GetThreadRef() == 0);
|
|
thread.Start();
|
|
EXPECT_TRUE(thread.GetThreadRef() != 0);
|
|
thread.Stop();
|
|
EXPECT_TRUE(thread.GetThreadRef() == 0);
|
|
}
|
|
|
|
TEST(PlatformThreadTest, StartStop2Deprecated) {
|
|
PlatformThread thread1(&NullRunFunctionDeprecated, nullptr,
|
|
"PlatformThreadTest1");
|
|
PlatformThread thread2(&NullRunFunctionDeprecated, nullptr,
|
|
"PlatformThreadTest2");
|
|
EXPECT_TRUE(thread1.GetThreadRef() == thread2.GetThreadRef());
|
|
thread1.Start();
|
|
thread2.Start();
|
|
EXPECT_TRUE(thread1.GetThreadRef() != thread2.GetThreadRef());
|
|
thread2.Stop();
|
|
thread1.Stop();
|
|
}
|
|
|
|
TEST(PlatformThreadTest, RunFunctionIsCalledDeprecated) {
|
|
bool flag = false;
|
|
PlatformThread thread(&SetFlagRunFunctionDeprecated, &flag,
|
|
"RunFunctionIsCalled");
|
|
thread.Start();
|
|
|
|
// At this point, the flag may be either true or false.
|
|
thread.Stop();
|
|
|
|
// We expect the thread to have run at least once.
|
|
EXPECT_TRUE(flag);
|
|
}
|
|
|
|
TEST(PlatformThreadTest, StartStop) {
|
|
PlatformThread thread(&NullRunFunction, nullptr, "PlatformThreadTest");
|
|
EXPECT_TRUE(thread.name() == "PlatformThreadTest");
|
|
EXPECT_TRUE(thread.GetThreadRef() == 0);
|
|
thread.Start();
|
|
EXPECT_TRUE(thread.GetThreadRef() != 0);
|
|
thread.Stop();
|
|
EXPECT_TRUE(thread.GetThreadRef() == 0);
|
|
}
|
|
|
|
TEST(PlatformThreadTest, StartStop2) {
|
|
PlatformThread thread1(&NullRunFunction, nullptr, "PlatformThreadTest1");
|
|
PlatformThread thread2(&NullRunFunction, nullptr, "PlatformThreadTest2");
|
|
EXPECT_TRUE(thread1.GetThreadRef() == thread2.GetThreadRef());
|
|
thread1.Start();
|
|
thread2.Start();
|
|
EXPECT_TRUE(thread1.GetThreadRef() != thread2.GetThreadRef());
|
|
thread2.Stop();
|
|
thread1.Stop();
|
|
}
|
|
|
|
TEST(PlatformThreadTest, RunFunctionIsCalled) {
|
|
bool flag = false;
|
|
PlatformThread thread(&SetFlagRunFunction, &flag, "RunFunctionIsCalled");
|
|
thread.Start();
|
|
|
|
// At this point, the flag may be either true or false.
|
|
thread.Stop();
|
|
|
|
// We expect the thread to have run at least once.
|
|
EXPECT_TRUE(flag);
|
|
}
|
|
|
|
} // rtc
|