generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

talk_base: remove lock inversion between MessageQueue and MessageQueueManager.

Browse Source 
Removes the concept of a MessageQueue being "active" in favor of considering all
live MQ's to be active.
(previously a MQ was active starting from the first Post to it and stopped being
active in its dtor).

BUG=3230
R=sriniv@google.com

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6190 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2014-05-19 17:58:04 +00:00
parent cb711f77d2
commit 40bc7779aa
3 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
talk/base/messagequeue.cc
View File

@ -126,7 +126,7 @@ void MessageQueueManager::ClearInternal(MessageHandler *handler) {
// MessageQueue // MessageQueue
MessageQueue::MessageQueue(SocketServer* ss) MessageQueue::MessageQueue(SocketServer* ss)
: ss_(ss), fStop_(false), fPeekKeep_(false), active_(false), : ss_(ss), fStop_(false), fPeekKeep_(false),
dmsgq_next_num_(0) { dmsgq_next_num_(0) {
if (!ss_) { if (!ss_) {
// Currently, MessageQueue holds a socket server, and is the base class for // Currently, MessageQueue holds a socket server, and is the base class for
@ -138,6 +138,7 @@ MessageQueue::MessageQueue(SocketServer* ss)
ss_ = default_ss_.get(); ss_ = default_ss_.get();
} }
ss_->SetMessageQueue(this); ss_->SetMessageQueue(this);
MessageQueueManager::Add(this);
} }
MessageQueue::~MessageQueue() { MessageQueue::~MessageQueue() {
@ -145,10 +146,8 @@ MessageQueue::~MessageQueue() {
// that it always gets called when the queue // that it always gets called when the queue
// is going away. // is going away.
SignalQueueDestroyed(); SignalQueueDestroyed();
if (active_) { MessageQueueManager::Remove(this);
MessageQueueManager::Remove(this); Clear(NULL);
Clear(NULL);
}
if (ss_) { if (ss_) {
ss_->SetMessageQueue(NULL); ss_->SetMessageQueue(NULL);
} }
@ -296,7 +295,6 @@ void MessageQueue::Post(MessageHandler *phandler, uint32 id,
// Signal for the multiplexer to return // Signal for the multiplexer to return
CritScope cs(&crit_); CritScope cs(&crit_);
EnsureActive();
Message msg; Message msg;
msg.phandler = phandler; msg.phandler = phandler;
msg.message_id = id; msg.message_id = id;
@ -318,7 +316,6 @@ void MessageQueue::DoDelayPost(int cmsDelay, uint32 tstamp,
// Signal for the multiplexer to return. // Signal for the multiplexer to return.
CritScope cs(&crit_); CritScope cs(&crit_);
EnsureActive();
Message msg; Message msg;
msg.phandler = phandler; msg.phandler = phandler;
msg.message_id = id; msg.message_id = id;
@ -401,12 +398,4 @@ void MessageQueue::Dispatch(Message *pmsg) {
pmsg->phandler->OnMessage(pmsg); pmsg->phandler->OnMessage(pmsg);
} }
void MessageQueue::EnsureActive() {
ASSERT(crit_.CurrentThreadIsOwner());
if (!active_) {
active_ = true;
MessageQueueManager::Add(this);
}
}
} // namespace talk_base } // namespace talk_base

6
talk/base/messagequeue.h
View File

@ -75,7 +75,7 @@ class MessageQueueManager {
void ClearInternal(MessageHandler *handler); void ClearInternal(MessageHandler *handler);
static MessageQueueManager* instance_; static MessageQueueManager* instance_;
// This list contains 'active' MessageQueues. // This list contains all live MessageQueues.
std::vector<MessageQueue *> message_queues_; std::vector<MessageQueue *> message_queues_;
CriticalSection crit_; CriticalSection crit_;
}; };
@ -247,7 +247,6 @@ class MessageQueue {
void reheap() { make_heap(c.begin(), c.end(), comp); } void reheap() { make_heap(c.begin(), c.end(), comp); }
}; };
void EnsureActive();
void DoDelayPost(int cmsDelay, uint32 tstamp, MessageHandler *phandler, void DoDelayPost(int cmsDelay, uint32 tstamp, MessageHandler *phandler,
uint32 id, MessageData* pdata); uint32 id, MessageData* pdata);
@ -258,9 +257,6 @@ class MessageQueue {
bool fStop_; bool fStop_;
bool fPeekKeep_; bool fPeekKeep_;
Message msgPeek_; Message msgPeek_;
// A message queue is active if it has ever had a message posted to it.
// This also corresponds to being in MessageQueueManager's global list.
bool active_;
MessageList msgq_; MessageList msgq_;
PriorityQueue dmsgq_; PriorityQueue dmsgq_;
uint32 dmsgq_next_num_; uint32 dmsgq_next_num_;

4
talk/base/thread.cc
View File

@ -157,8 +157,7 @@ Thread::Thread(SocketServer* ss)
Thread::~Thread() { Thread::~Thread() {
Stop(); Stop();
if (active_) Clear(NULL);
Clear(NULL);
} }
bool Thread::SleepMs(int milliseconds) { bool Thread::SleepMs(int milliseconds) {
@ -403,7 +402,6 @@ void Thread::Send(MessageHandler *phandler, uint32 id, MessageData *pdata) {
bool ready = false; bool ready = false;
{ {
CritScope cs(&crit_); CritScope cs(&crit_);
EnsureActive();
_SendMessage smsg; _SendMessage smsg;
smsg.thread = current_thread; smsg.thread = current_thread;
smsg.msg = msg; smsg.msg = msg;