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

Fix concurrent issue in read/write of search params.

Browse source
This commit is contained in:
vng 2012-10-18 02:36:15 +03:00 • committed by Alex Zolotarev
parent a28abafa33
commit 2f2c977dc8
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
search/search_engine.cpp
View file

@ -142,24 +142,25 @@ void Engine::PrepareSearch(m2::RectD const & viewport,
bool Engine::Search(SearchParams const & params, m2::RectD const & viewport)
{
// Check for equal query.
if (!params.IsResetMode() &&
m_params.IsEqualCommon(params) &&
m2::IsEqual(m_viewport, viewport, epsEqualRects, epsEqualRects))
{
if (!m_params.m_validPos)
return false;
m2::PointD const p1 = GetViewportXY(m_params.m_lat, m_params.m_lon);
m2::PointD const p2 = GetViewportXY(params.m_lat, params.m_lon);
if (p1.EqualDxDy(p2, epsEqualPoints))
return false;
}
{
// Assign new search params.
threads::MutexGuard guard(m_updateMutex);
// Check for equal query.
if (!params.IsResetMode() &&
m_params.IsEqualCommon(params) &&
m2::IsEqual(m_viewport, viewport, epsEqualRects, epsEqualRects))
{
if (!m_params.m_validPos)
return false;
m2::PointD const p1 = GetViewportXY(m_params.m_lat, m_params.m_lon);
m2::PointD const p2 = GetViewportXY(params.m_lat, params.m_lon);
if (p1.EqualDxDy(p2, epsEqualPoints))
return false;
}
// Assign new search params.
m_params = params;
m_viewport = viewport;
}