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

Fix main thread freezing when allocating resources.

Browse source
This commit is contained in:
vng 2012-12-27 14:22:23 +03:00 • committed by Alex Zolotarev
parent fc3d8554d4
commit ae895dd851
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
base/resource_pool.hpp
View file

@ -3,6 +3,8 @@
#include "thread.hpp"
#include "threaded_list.hpp"
#include "logging.hpp"
#include "assert.hpp"
#include "../std/bind.hpp"
#include "../std/scoped_ptr.hpp"
@ -226,11 +228,22 @@ struct AllocateOnDemandSingleThreadedPoolTraits : TBase
elem_t const Reserve()
{
elem_t res;
/// allocate resources if needed if we're on the main thread.
if (threads::GetCurrentThreadID() == base_t::m_MainThreadID)
base_t::m_pool.ProcessList(bind(&self_t::AllocateIfNeeded, this, _1));
base_t::m_pool.ProcessList(bind(&self_t::AllocateAndReserve, this, _1, ref(res)));
else
res = base_t::Reserve();
return res;
}
return base_t::Reserve();
void AllocateAndReserve(list<elem_t> & l, elem_t & res)
{
AllocateIfNeeded(l);
ASSERT ( !l.empty(), () );
res = l.front();
l.pop_front();
}
void UpdateState()