diff --git a/routing/async_router.cpp b/routing/async_router.cpp index 75038486aa..49d6110789 100644 --- a/routing/async_router.cpp +++ b/routing/async_router.cpp @@ -157,7 +157,7 @@ void AsyncRouter::RouterDelegateProxy::OnPointCheck(m2::PointD const & pt) lock_guard l(m_guard); CHECK(m_onPointCheck, ()); - if (m_delegate.IsCancelled()) + if (m_delegateProxy.IsCancelled()) return; onPointCheck = m_onPointCheck; @@ -220,9 +220,10 @@ void AsyncRouter::CalculateRoute(Checkpoints const & checkpoints, m2::PointD con ResetDelegate(); - m_delegate = make_shared(readyCallback, needMoreMapsCallback, removeRouteCallback, - m_pointCheckCallback, progressCallback, timeoutSec); - + m_delegateProxy = + make_shared(readyCallback, needMoreMapsCallback, removeRouteCallback, + m_pointCheckCallback, progressCallback, timeoutSec); + m_hasRequest = true; m_threadCondVar.notify_one(); } @@ -299,10 +300,10 @@ void AsyncRouter::LogCode(RouterResultCode code, double const elapsedSec) void AsyncRouter::ResetDelegate() { - if (m_delegate) + if (m_delegateProxy) { - m_delegate->Cancel(); - m_delegate.reset(); + m_delegateProxy->Cancel(); + m_delegateProxy.reset(); } } @@ -334,7 +335,7 @@ void AsyncRouter::ThreadFunc() void AsyncRouter::CalculateRoute() { Checkpoints checkpoints; - shared_ptr delegate; + shared_ptr delegateProxy; m2::PointD startDirection; bool adjustToPrevRoute = false; shared_ptr absentFetcher; @@ -352,13 +353,13 @@ void AsyncRouter::CalculateRoute() return; if (!m_router) return; - if (!m_delegate) + if (!m_delegateProxy) return; checkpoints = m_checkpoints; startDirection = m_startDirection; adjustToPrevRoute = m_adjustToPrevRoute; - delegate = m_delegate; + delegateProxy = m_delegateProxy; router = m_router; absentFetcher = m_absentFetcher; routeId = ++m_routeCounter; @@ -382,7 +383,7 @@ void AsyncRouter::CalculateRoute() // Run basic request. code = router->CalculateRoute(checkpoints, startDirection, adjustToPrevRoute, - delegate->GetDelegate(), *route); + delegateProxy->GetDelegate(), *route); elapsedSec = timer.ElapsedSeconds(); // routing time LogCode(code, elapsedSec); @@ -401,7 +402,7 @@ void AsyncRouter::CalculateRoute() // Note. After call of this method |route| should be used only on ui thread. // And |route| should stop using on routing background thread, in this method. GetPlatform().RunTask(Platform::Thread::Gui, - [delegate, route, code]() { delegate->OnReady(route, code); }); + [delegateProxy, route, code]() { delegateProxy->OnReady(route, code); }); return; } @@ -419,7 +420,7 @@ void AsyncRouter::CalculateRoute() // Note. After call of this method |route| should be used only on ui thread. // And |route| should stop using on routing background thread, in this method. GetPlatform().RunTask(Platform::Thread::Gui, - [delegate, route, code]() { delegate->OnReady(route, code); }); + [delegateProxy, route, code]() { delegateProxy->OnReady(route, code); }); } bool const needFetchAbsent = (code != RouterResultCode::Cancelled); @@ -441,14 +442,14 @@ void AsyncRouter::CalculateRoute() { if (code == RouterResultCode::NeedMoreMaps) { - GetPlatform().RunTask(Platform::Thread::Gui, [delegate, routeId, absent]() { - delegate->OnNeedMoreMaps(routeId, absent); + GetPlatform().RunTask(Platform::Thread::Gui, [delegateProxy, routeId, absent]() { + delegateProxy->OnNeedMoreMaps(routeId, absent); }); } else { GetPlatform().RunTask(Platform::Thread::Gui, - [delegate, code]() { delegate->OnRemoveRoute(code); }); + [delegateProxy, code]() { delegateProxy->OnRemoveRoute(code); }); } } } diff --git a/routing/async_router.hpp b/routing/async_router.hpp index 797374f267..14cf55bbbc 100644 --- a/routing/async_router.hpp +++ b/routing/async_router.hpp @@ -115,7 +115,7 @@ private: Checkpoints m_checkpoints; m2::PointD m_startDirection = m2::PointD::Zero(); bool m_adjustToPrevRoute = false; - std::shared_ptr m_delegate; + std::shared_ptr m_delegateProxy; std::shared_ptr m_absentFetcher; std::shared_ptr m_router; diff --git a/routing/online_absent_fetcher.cpp b/routing/online_absent_fetcher.cpp index 5d66ec6599..aedcf41837 100644 --- a/routing/online_absent_fetcher.cpp +++ b/routing/online_absent_fetcher.cpp @@ -4,7 +4,6 @@ #include "platform/platform.hpp" #include "platform/country_file.hpp" -#include "platform/local_country_file.hpp" #include "base/stl_helpers.hpp" @@ -27,9 +26,15 @@ OnlineAbsentCountriesFetcher::OnlineAbsentCountriesFetcher( void OnlineAbsentCountriesFetcher::GenerateRequest(Checkpoints const & checkpoints) { - if (GetPlatform().ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE) + if (Platform::ConnectionStatus() == Platform::EConnectionType::CONNECTION_NONE) return; + if (m_fetcherThread) + { + m_fetcherThread->Cancel(); + m_fetcherThread.reset(); + } + // Single mwm case. if (AllPointsInSameMwm(checkpoints)) return; @@ -37,7 +42,7 @@ void OnlineAbsentCountriesFetcher::GenerateRequest(Checkpoints const & checkpoin unique_ptr fetcher = make_unique(m_countryFileFn, OSRM_ONLINE_SERVER_URL, checkpoints); // iOS can't reuse threads. So we need to recreate the thread. - m_fetcherThread.reset(new threads::Thread()); + m_fetcherThread = make_unique(); m_fetcherThread->Create(move(fetcher)); } diff --git a/routing/online_absent_fetcher.hpp b/routing/online_absent_fetcher.hpp index fc470c6e27..5fe98e601b 100644 --- a/routing/online_absent_fetcher.hpp +++ b/routing/online_absent_fetcher.hpp @@ -34,7 +34,7 @@ public: OnlineAbsentCountriesFetcher(TCountryFileFn const &, TCountryLocalFileFn const &); // IOnlineFetcher overrides: - void GenerateRequest(Checkpoints const &) override; + void GenerateRequest(Checkpoints const & checkpoints) override; void GetAbsentCountries(std::set & countries) override; private: