Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

issue #2305: Fixing a bug that passing wrong mutex parameter to "wait".

This commit is contained in:
James Chen 2013-06-26 11:06:13 +08:00
parent f2ab73c533
commit 3ad11cc63a
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
extensions/network/HttpClient.cpp
View File

@ -104,13 +104,14 @@ static void networkThread(void)
// step 1: send http request if the requestQueue isn't empty
request = NULL;
{
std::unique_lock<std::mutex> lk(s_requestQueueMutex); //Get request task from queue
s_SleepCondition.wait(lk, []{ return 0 != s_requestQueue->count(); });
s_requestQueueMutex.lock();
request = dynamic_cast<HttpRequest*>(s_requestQueue->objectAtIndex(0));
s_requestQueue->removeObjectAtIndex(0);
s_requestQueueMutex.unlock();
std::unique_lock<std::mutex> lk(s_SleepMutex); //Get request task from queue
s_SleepCondition.wait(lk, []{ return 0 != s_requestQueue->count(); });
request = dynamic_cast<HttpRequest*>(s_requestQueue->objectAtIndex(0));
s_requestQueue->removeObjectAtIndex(0);
}
// step 2: libcurl sync access