zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete deprecated PlatformThread looping

Browse Source 
Bug: webrtc:10594, webrtc:7187
Change-Id: Icba3a5cf6dbe817ead427c27645b3ad7bc8819be
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/134642
Commit-Queue: Niels Moller <nisse@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Reviewed-by: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27833}
This commit is contained in:
Niels Möller
2019-05-03 09:34:24 +02:00
committed by Commit Bot
parent da87648470
commit 4731f0062e
22 changed files with 251 additions and 353 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
rtc_base/platform_thread_unittest.cc
View File

@ -15,27 +15,10 @@
namespace rtc {
namespace {
// Function that does nothing, and reports success.
bool NullRunFunctionDeprecated(void* obj) {
webrtc::SleepMs(2); // Hand over timeslice, prevents busy looping.
return true;
}
bool TooBusyRunFunction(void* obj) {
// Indentionally 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;
@ -43,43 +26,6 @@ void SetFlagRunFunction(void* obj) {
} // 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");
@ -113,16 +59,4 @@ TEST(PlatformThreadTest, RunFunctionIsCalled) {
EXPECT_TRUE(flag);
}
// This test is disabled since it will cause a crash.
// There might be a way to implement this as a death test, but it looks like
// a death test requires an expression to be checked but does not allow a
// flag to be raised that says "some thread will crash after this point".
// TODO(tommi): Look into ways to enable the test by default.
TEST(PlatformThreadTest, DISABLED_TooBusyDeprecated) {
PlatformThread thread(&TooBusyRunFunction, nullptr, "BusyThread");
thread.Start();
webrtc::SleepMs(1000);
thread.Stop();
}
} // namespace rtc