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

Don't do RenderPolicy::FrameLock (Unlock) in GetVisiblePOI. It's useless and can cause deadlock.

Browse source
This commit is contained in:
vng 2013-07-05 15:42:19 +03:00 • committed by Alex Zolotarev
parent 41a810140e
commit 19d314d1fa
1 changed files with 29 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
map/framework.cpp
View file

@ -1482,15 +1482,17 @@ bool Framework::IsBenchmarking() const
return m_benchmarkEngine != 0;
}
shared_ptr<graphics::OverlayElement> GetClosestToPivot(list<shared_ptr<graphics::OverlayElement> > const & l,
m2::PointD const & pxPoint)
namespace
{
typedef shared_ptr<graphics::OverlayElement> OEPointerT;
OEPointerT GetClosestToPivot(list<OEPointerT> const & l, m2::PointD const & pxPoint)
{
double dist = numeric_limits<double>::max();
shared_ptr<graphics::OverlayElement> res;
OEPointerT res;
for (list<shared_ptr<graphics::OverlayElement> >::const_iterator it = l.begin();
it != l.end();
++it)
for (list<OEPointerT>::const_iterator it = l.begin(); it != l.end(); ++it)
{
double const curDist = pxPoint.SquareLength((*it)->pivot());
if (curDist < dist)
@ -1503,37 +1505,38 @@ shared_ptr<graphics::OverlayElement> GetClosestToPivot(list<shared_ptr<graphics:
return res;
}
}
bool Framework::GetVisiblePOI(m2::PointD const & pxPoint, m2::PointD & pxPivot,
search::AddressInfo & info) const
{
m_renderPolicy->FrameLock();
graphics::OverlayElement::UserInfo ui;
m2::PointD const pt = m_navigator.ShiftPoint(pxPoint);
double const halfSize = TOUCH_PIXEL_RADIUS * GetVisualScale();
typedef graphics::OverlayElement ElementT;
list<shared_ptr<ElementT> > candidates;
m2::RectD rect(pt.x - halfSize, pt.y - halfSize,
pt.x + halfSize, pt.y + halfSize);
{
// It seems like we don't need to lock frame here.
// Locking of overlay and storing items as shared_ptr is enough here.
//m_renderPolicy->FrameLock();
m2::PointD const pt = m_navigator.ShiftPoint(pxPoint);
double const halfSize = TOUCH_PIXEL_RADIUS * GetVisualScale();
list<OEPointerT> candidates;
m2::RectD rect(pt.x - halfSize, pt.y - halfSize,
pt.x + halfSize, pt.y + halfSize);
graphics::Overlay * frameOverlay = m_renderPolicy->FrameOverlay();
frameOverlay->lock();
frameOverlay->selectOverlayElements(rect, candidates);
frameOverlay->unlock();
OEPointerT elem = GetClosestToPivot(candidates, pt);
if (elem)
ui = elem->userInfo();
//m_renderPolicy->FrameUnlock();
}
shared_ptr<ElementT> elem = GetClosestToPivot(candidates, pt);
/// cloning element to avoid it's modification after FrameUnlock.
ElementT::UserInfo ui;
if (elem)
ui = elem->userInfo();
m_renderPolicy->FrameUnlock();
if (ui.IsValid())
{
Index::FeaturesLoaderGuard guard(m_model.GetIndex(), ui.m_mwmID);