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

Update libjingle to CL 53398036.

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/2323004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4872 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org
2013-09-27 23:04:10 +00:00
parent 34c50c1de1
commit a27be8e4a1
41 changed files with 496 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
talk/base/thread.cc
View File

@@ -146,7 +146,6 @@ Thread::Thread(SocketServer* ss)
: MessageQueue(ss),
priority_(PRIORITY_NORMAL),
started_(false),
has_sends_(false),
#if defined(WIN32)
thread_(NULL),
thread_id_(0),
@@ -405,7 +404,6 @@ void Thread::Send(MessageHandler *phandler, uint32 id, MessageData *pdata) {
smsg.msg = msg;
smsg.ready = &ready;
sendlist_.push_back(smsg);
has_sends_ = true;
}
// Wait for a reply
@@ -436,11 +434,6 @@ void Thread::Send(MessageHandler *phandler, uint32 id, MessageData *pdata) {
}
void Thread::ReceiveSends() {
// Before entering critical section, check boolean.
if (!has_sends_)
return;
// Receive a sent message. Cleanup scenarios:
// - thread sending exits: We don't allow this, since thread can exit
// only via Join, so Send must complete.
@@ -456,7 +449,6 @@ void Thread::ReceiveSends() {
*smsg.ready = true;
smsg.thread->socketserver()->WakeUp();
}
has_sends_ = false;
crit_.Leave();
}