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

fixed deadlock when some thread steal newly allocated resource from the thread which allocates it.

Browse source
This commit is contained in:
rachytski 2013-01-13 00:26:42 +03:00 • committed by Alex Zolotarev
parent d3d1741fec
commit 7e8b40e59d
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
base/resource_pool.hpp
View file

@ -194,8 +194,18 @@ struct AllocateOnDemandMultiThreadedPoolTraits : TBase
elem_t const Reserve()
{
base_t::m_pool.ProcessList(bind(&self_t::AllocateIfNeeded, this, _1));
return base_t::Reserve();
elem_t res;
base_t::m_pool.ProcessList(bind(&self_t::AllocateAndReserve, this, _1, ref(res)));
return res;
}
void AllocateAndReserve(list<elem_t> & l, elem_t & res)
{
AllocateIfNeeded(l);
ASSERT ( !l.empty(), () );
res = l.front();
l.pop_front();
}
};