mollyim/webrtc
1
0
Fork 0
mirror of https://github.com/mollyim/webrtc.git synced 2025-05-14 06:10:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow overwriting current thread in ThreadManager.

Browse source 
This prepares for introducing a simulated time rtc::ThreadManager
implementation that will run on a single underlying thread.

Bug: webrtc:11255
Change-Id: I793128cc0b8e649a3675914de67dfee3298b446a
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/165765
Commit-Queue: Sebastian Jansson <srte@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30256}
This commit is contained in:
Sebastian Jansson 2020-01-14 11:12:26 +01:00 committed by Commit Bot
parent 21feefcf8e
commit 178a685ada
2 changed files with 19 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
rtc_base/thread.cc
View file

@ -237,12 +237,7 @@ Thread* ThreadManager::CurrentThread() {
return static_cast<Thread*>(pthread_getspecific(key_)); return static_cast<Thread*>(pthread_getspecific(key_));
} }
void ThreadManager::SetCurrentThread(Thread* thread) { void ThreadManager::SetCurrentThreadInternal(Thread* thread) {
#if RTC_DLOG_IS_ON
if (CurrentThread() && thread) {
RTC_DLOG(LS_ERROR) << "SetCurrentThread: Overwriting an existing value?";
}
#endif // RTC_DLOG_IS_ON
pthread_setspecific(key_, thread); pthread_setspecific(key_, thread);
} }
#endif #endif
@ -255,12 +250,24 @@ Thread* ThreadManager::CurrentThread() {
return static_cast<Thread*>(TlsGetValue(key_)); return static_cast<Thread*>(TlsGetValue(key_));
} }
void ThreadManager::SetCurrentThread(Thread* thread) { void ThreadManager::SetCurrentThreadInternal(Thread* thread) {
RTC_DCHECK(!CurrentThread() || !thread);
TlsSetValue(key_, thread); TlsSetValue(key_, thread);
} }
#endif #endif
void ThreadManager::SetCurrentThread(Thread* thread) {
#if RTC_DLOG_IS_ON
if (CurrentThread() && thread) {
RTC_DLOG(LS_ERROR) << "SetCurrentThread: Overwriting an existing value?";
}
#endif // RTC_DLOG_IS_ON
SetCurrentThreadInternal(thread);
}
void rtc::ThreadManager::ChangeCurrentThreadForTest(rtc::Thread* thread) {
SetCurrentThreadInternal(thread);
}
Thread* ThreadManager::WrapCurrentThread() { Thread* ThreadManager::WrapCurrentThread() {
Thread* result = CurrentThread(); Thread* result = CurrentThread();
if (nullptr == result) { if (nullptr == result) {

4
rtc_base/thread.h
View file

@ -90,6 +90,9 @@ class RTC_EXPORT ThreadManager {
Thread* CurrentThread(); Thread* CurrentThread();
void SetCurrentThread(Thread* thread); void SetCurrentThread(Thread* thread);
// Allows changing the current thread, this is intended for tests where we
// want to simulate multiple threads running on a single physical thread.
void ChangeCurrentThreadForTest(Thread* thread);
// Returns a thread object with its thread_ ivar set // Returns a thread object with its thread_ ivar set
// to whatever the OS uses to represent the thread. // to whatever the OS uses to represent the thread.
@ -113,6 +116,7 @@ class RTC_EXPORT ThreadManager {
ThreadManager(); ThreadManager();
~ThreadManager(); ~ThreadManager();
void SetCurrentThreadInternal(Thread* thread);
void AddInternal(Thread* message_queue); void AddInternal(Thread* message_queue);
void RemoveInternal(Thread* message_queue); void RemoveInternal(Thread* message_queue);
void ClearInternal(MessageHandler* handler); void ClearInternal(MessageHandler* handler);