mirror of
https://github.com/jpd002/Play-.git
synced 2025-04-28 13:47:57 +03:00
Clean locks.
This commit is contained in:
parent
58a9c2f278
commit
5b80de936e
1 changed files with 7 additions and 6 deletions
|
@ -7,7 +7,7 @@ bool CMailBox::IsPending() const
|
|||
|
||||
void CMailBox::WaitForCall()
|
||||
{
|
||||
std::unique_lock<std::mutex> callLock(m_callMutex);
|
||||
std::unique_lock callLock(m_callMutex);
|
||||
while(!IsPending())
|
||||
{
|
||||
m_waitCondition.wait(callLock);
|
||||
|
@ -16,7 +16,7 @@ void CMailBox::WaitForCall()
|
|||
|
||||
void CMailBox::WaitForCall(unsigned int timeOut)
|
||||
{
|
||||
std::unique_lock<std::mutex> callLock(m_callMutex);
|
||||
std::unique_lock callLock(m_callMutex);
|
||||
if(IsPending()) return;
|
||||
m_waitCondition.wait_for(callLock, std::chrono::milliseconds(timeOut));
|
||||
}
|
||||
|
@ -29,8 +29,8 @@ void CMailBox::FlushCalls()
|
|||
void CMailBox::SendCall(const FunctionType& function, bool waitForCompletion)
|
||||
{
|
||||
std::future<void> future;
|
||||
|
||||
{
|
||||
std::unique_lock<std::mutex> callLock(m_callMutex);
|
||||
MESSAGE message;
|
||||
message.function = function;
|
||||
|
||||
|
@ -40,6 +40,7 @@ void CMailBox::SendCall(const FunctionType& function, bool waitForCompletion)
|
|||
future = message.promise->get_future();
|
||||
}
|
||||
|
||||
std::lock_guard callLock(m_callMutex);
|
||||
m_calls.push_back(std::move(message));
|
||||
}
|
||||
|
||||
|
@ -53,11 +54,11 @@ void CMailBox::SendCall(const FunctionType& function, bool waitForCompletion)
|
|||
|
||||
void CMailBox::SendCall(FunctionType&& function)
|
||||
{
|
||||
std::lock_guard<std::mutex> callLock(m_callMutex);
|
||||
|
||||
{
|
||||
MESSAGE message;
|
||||
message.function = std::move(function);
|
||||
|
||||
std::lock_guard callLock(m_callMutex);
|
||||
m_calls.push_back(std::move(message));
|
||||
}
|
||||
|
||||
|
@ -68,7 +69,7 @@ void CMailBox::ReceiveCall()
|
|||
{
|
||||
MESSAGE message;
|
||||
{
|
||||
std::lock_guard<std::mutex> waitLock(m_callMutex);
|
||||
std::lock_guard callLock(m_callMutex);
|
||||
if(!IsPending()) return;
|
||||
message = std::move(m_calls.front());
|
||||
m_calls.pop_front();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue