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

Add locks to Start(), Stop() methods in ProcessThread.

Browse Source 
This is necessary unfortunately since there are a few places where DeRegisterModule does not reliably occur on the same thread.

BUG=4473
R=pbos@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/42979004

Cr-Commit-Position: refs/heads/master@{#8891}
This commit is contained in:
Tommi
2015-03-30 14:16:12 +00:00
parent 22e209d4f8
commit 842a4a6b50
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
webrtc/modules/utility/source/process_thread_impl.cc
View File

@ -66,8 +66,15 @@ void ProcessThreadImpl::Start() {
DCHECK(!stop_);
for (ModuleCallback& m : modules_)
m.module->ProcessThreadAttached(this);
{
// TODO(tommi): Since DeRegisterModule is currently being called from
// different threads in some cases (ChannelOwner), we need to lock access to
// the modules_ collection even on the controller thread.
// Once we've cleaned up those places, we can remove this lock.
rtc::CritScope lock(&lock_);
for (ModuleCallback& m : modules_)
m.module->ProcessThreadAttached(this);
}
thread_ = ThreadWrapper::CreateThread(
&ProcessThreadImpl::Run, this, "ProcessThread");
@ -90,12 +97,18 @@ void ProcessThreadImpl::Stop() {
thread_.reset();
stop_ = false;
// TODO(tommi): Since DeRegisterModule is currently being called from
// different threads in some cases (ChannelOwner), we need to lock access to
// the modules_ collection even on the controller thread.
// Once we've cleaned up those places, we can remove this lock.
rtc::CritScope lock(&lock_);
for (ModuleCallback& m : modules_)
m.module->ProcessThreadAttached(nullptr);
}
void ProcessThreadImpl::WakeUp(Module* module) {
// Allowed to be called on any thread.
// TODO(tommi): Disallow this ^^^
{
rtc::CritScope lock(&lock_);
for (ModuleCallback& m : modules_) {
@ -108,6 +121,7 @@ void ProcessThreadImpl::WakeUp(Module* module) {
void ProcessThreadImpl::PostTask(rtc::scoped_ptr<ProcessTask> task) {
// Allowed to be called on any thread.
// TODO(tommi): Disallow this ^^^
{
rtc::CritScope lock(&lock_);
queue_.push(task.release());