gvsafronov/futriix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug in condition_variabe.wait usage

Browse Source 
consition variable wait should always be called with a locked mutex.
This code break the pre-conditions of using wait.


Former-commit-id: 5b81303f04580010f043e518a109b43971a63054
This commit is contained in:
Muhammad Zahalqa 2020-06-13 20:14:51 +03:00 committed by John Sully
parent e25ec37484
commit 63bb6cb419
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ae.cpp
View File

@ -258,7 +258,7 @@ int aeCreateRemoteFileEvent(aeEventLoop *eventLoop, int fd, int mask,
if (fSynchronous) if (fSynchronous)
{ {
std::unique_lock<std::mutex> ulock(cmd.pctl->mutexcv, std::defer_lock); std::unique_lock<std::mutex> ulock(cmd.pctl->mutexcv);
cmd.pctl->cv.wait(ulock); cmd.pctl->cv.wait(ulock);
ret = cmd.pctl->rval; ret = cmd.pctl->rval;
delete cmd.pctl; delete cmd.pctl;
@ -311,7 +311,7 @@ int aePostFunction(aeEventLoop *eventLoop, std::function<void()> fn, bool fSynch
int ret = AE_OK; int ret = AE_OK;
if (fSynchronous) if (fSynchronous)
{ {
std::unique_lock<std::mutex> ulock(cmd.pctl->mutexcv, std::defer_lock); std::unique_lock<std::mutex> ulock(cmd.pctl->mutexcv);
cmd.pctl->cv.wait(ulock); cmd.pctl->cv.wait(ulock);
ret = cmd.pctl->rval; ret = cmd.pctl->rval;
delete cmd.pctl; delete cmd.pctl;