Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. | 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. |
| 3 * | 3 * |
| 4 * Use of this source code is governed by a BSD-style license | 4 * Use of this source code is governed by a BSD-style license |
| 5 * that can be found in the LICENSE file in the root of the source | 5 * that can be found in the LICENSE file in the root of the source |
| 6 * tree. An additional intellectual property rights grant can be found | 6 * tree. An additional intellectual property rights grant can be found |
| 7 * in the file PATENTS. All contributing project authors may | 7 * in the file PATENTS. All contributing project authors may |
| 8 * be found in the AUTHORS file in the root of the source tree. | 8 * be found in the AUTHORS file in the root of the source tree. |
| 9 */ | 9 */ |
| 10 | 10 |
| 11 #include "webrtc/system_wrappers/include/thread_wrapper.h" | 11 #include "webrtc/base/platform_thread.h" |
| 12 | 12 |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 13 #include "testing/gtest/include/gtest/gtest.h" |
| 14 #include "webrtc/base/scoped_ptr.h" | 14 #include "webrtc/base/scoped_ptr.h" |
| 15 #include "webrtc/system_wrappers/include/sleep.h" | 15 #include "webrtc/system_wrappers/include/sleep.h" |
| 16 | 16 |
| 17 namespace webrtc { | 17 namespace webrtc { |
| 18 | 18 |
| 19 // Function that does nothing, and reports success. | 19 // Function that does nothing, and reports success. |
| 20 bool NullRunFunction(void* obj) { | 20 bool NullRunFunction(void* obj) { |
| 21 SleepMs(0); // Hand over timeslice, prevents busy looping. | 21 SleepMs(0); // Hand over timeslice, prevents busy looping. |
| 22 return true; | 22 return true; |
| 23 } | 23 } |
| 24 | 24 |
| 25 TEST(ThreadTest, StartStop) { | 25 TEST(PlatformThreadTest, StartStop) { |
| 26 rtc::scoped_ptr<ThreadWrapper> thread = ThreadWrapper::CreateThread( | 26 rtc::scoped_ptr<PlatformThread> thread = PlatformThread::CreateThread( |
| 27 &NullRunFunction, nullptr, "ThreadTest"); | 27 &NullRunFunction, nullptr, "PlatformThreadTest"); |
| 28 ASSERT_TRUE(thread->Start()); | 28 ASSERT_TRUE(thread->Start()); |
| 29 EXPECT_TRUE(thread->Stop()); | 29 EXPECT_TRUE(thread->Stop()); |
| 30 } | 30 } |
| 31 | 31 |
| 32 // Function that sets a boolean. | 32 // Function that sets a boolean. |
| 33 bool SetFlagRunFunction(void* obj) { | 33 bool SetFlagRunFunction(void* obj) { |
| 34 bool* obj_as_bool = static_cast<bool*>(obj); | 34 bool* obj_as_bool = static_cast<bool*>(obj); |
| 35 *obj_as_bool = true; | 35 *obj_as_bool = true; |
| 36 SleepMs(0); // Hand over timeslice, prevents busy looping. | 36 SleepMs(0); // Hand over timeslice, prevents busy looping. |
| 37 return true; | 37 return true; |
| 38 } | 38 } |
| 39 | 39 |
| 40 TEST(ThreadTest, RunFunctionIsCalled) { | 40 TEST(PlatformThreadTest, RunFunctionIsCalled) { |
| 41 bool flag = false; | 41 bool flag = false; |
| 42 rtc::scoped_ptr<ThreadWrapper> thread = ThreadWrapper::CreateThread( | 42 rtc::scoped_ptr<PlatformThread> thread = PlatformThread::CreateThread( |
|
tommi
2015/11/23 14:49:12
do we need CreateThread() now that the implementat
pbos-webrtc
2015/11/23 15:05:40
Nope, hence the TODO in the header. Preferring to
| |
| 43 &SetFlagRunFunction, &flag, "RunFunctionIsCalled"); | 43 &SetFlagRunFunction, &flag, "RunFunctionIsCalled"); |
| 44 ASSERT_TRUE(thread->Start()); | 44 ASSERT_TRUE(thread->Start()); |
| 45 | 45 |
| 46 // At this point, the flag may be either true or false. | 46 // At this point, the flag may be either true or false. |
| 47 EXPECT_TRUE(thread->Stop()); | 47 EXPECT_TRUE(thread->Stop()); |
| 48 | 48 |
| 49 // We expect the thread to have run at least once. | 49 // We expect the thread to have run at least once. |
| 50 EXPECT_TRUE(flag); | 50 EXPECT_TRUE(flag); |
| 51 } | 51 } |
| 52 | 52 |
| 53 #if defined(WEBRTC_POSIX) | |
| 54 TEST(PlatformThreadTestPosix, PrioritySettings) { | |
|
tommi
2015/11/23 14:49:12
delete this test?
pbos-webrtc
2015/11/23 15:05:40
Done.
| |
| 55 // API assumes that max_prio - min_prio > 2. Test the extreme case. | |
| 56 const int kMinPrio = -1; | |
| 57 const int kMaxPrio = 2; | |
| 58 | |
| 59 int last_priority = kMinPrio; | |
| 60 for (int priority = webrtc::kLowPriority; | |
| 61 priority <= webrtc::kRealtimePriority; ++priority) { | |
| 62 int system_priority = PlatformThread::ConvertToSystemPriority( | |
| 63 static_cast<webrtc::ThreadPriority>(priority), kMinPrio, kMaxPrio); | |
| 64 EXPECT_GT(system_priority, kMinPrio); | |
| 65 EXPECT_LT(system_priority, kMaxPrio); | |
| 66 EXPECT_GE(system_priority, last_priority); | |
| 67 last_priority = system_priority; | |
| 68 } | |
| 69 } | |
| 70 #endif // defined(WEBRTC_POSIX) | |
| 53 } // namespace webrtc | 71 } // namespace webrtc |
| OLD | NEW |