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

Make index exception-safe!

Browse source
This commit is contained in:
Yury Melnichek 2011-06-05 18:48:09 +02:00 • committed by Alex Zolotarev
parent c8466bdeb0
commit 46c2f39910
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
indexer/index.hpp
View file

@ -127,16 +127,9 @@ public:
if (pIndex) // pIndex may be NULL because it doesn't match scale or occlusionRect.
{
ProxyUnlockGuard proxyUnlockGuard(m_mutex, pProxy);
UNUSED_VALUE(proxyUnlockGuard);
pIndex->ForEachInIntervalAndScale(f, beg, end, scale, query);
{
threads::MutexGuard mutexGuard(m_mutex);
UNUSED_VALUE(mutexGuard);
pProxy->Unlock();
if (pProxy->m_action == IndexProxy::INDEX_CLOSE)
pProxy->CloseIfUnlocked();
}
}
}
}
@ -341,6 +334,30 @@ private:
uint8_t volatile m_queriesSkipped;
};
// Helper class that unlocks given IndexProxy in destructor.
class ProxyUnlockGuard
{
threads::Mutex & m_mutex;
IndexProxy * m_pProxy;
public:
ProxyUnlockGuard(threads::Mutex & mutex, IndexProxy * pProxy)
: m_mutex(mutex), m_pProxy(pProxy)
{
}
~ProxyUnlockGuard()
{
threads::MutexGuard mutexGuard(m_mutex);
UNUSED_VALUE(mutexGuard);
m_pProxy->Unlock();
if (m_pProxy->m_action == IndexProxy::INDEX_CLOSE)
m_pProxy->CloseIfUnlocked();
}
};
mutable vector<IndexProxy *> m_indexes;
mutable threads::Mutex m_mutex;
};