pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

more precise synchronization of Fence mechanism.

Browse source
This commit is contained in:
rachytski 2012-01-28 01:17:10 +04:00 • committed by Alex Zolotarev
parent 246429d3c4
commit b3e4a47c3a
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
base/fence_manager.cpp
View file

@ -47,7 +47,7 @@ int FenceManager::insertFence()
void FenceManager::signalFence(int id)
{
threads::MutexGuard g(m_mutex);
threads::MutexGuard mutexGuard(m_mutex);
if (m_isCancelled)
return;
@ -62,6 +62,7 @@ void FenceManager::signalFence(int id)
threads::Condition * cond = it->second;
/// i suppose that this guard will be destroyed after mutexGuard
threads::ConditionGuard fenceGuard(*cond);
/// erasing fence from active fences
@ -92,11 +93,17 @@ void FenceManager::joinFence(int id)
}
cond = it->second;
/// we should lock condition here, to prevent us from the situation
/// when the condition will be signaled before it's been waited for
cond->Lock();
}
threads::ConditionGuard fenceGuard(*cond);
if (m_activeFences.find(id) != m_activeFences.end())
fenceGuard.Wait();
/// to prevent from "spurious wakeups"
while (m_activeFences.find(id) != m_activeFences.end())
cond->Wait();
cond->Unlock();
}
void FenceManager::cancel()