From b9fe0a5edf0d00a2bc99b5b43d5cbaad3ef68967 Mon Sep 17 00:00:00 2001 From: Viktor Govako Date: Thu, 26 May 2022 12:04:44 +0300 Subject: [PATCH] [routing] Free MwmHandle set in routing::MwmDataSource. Signed-off-by: Viktor Govako --- routing/data_source.hpp | 7 +++++++ routing/index_router.cpp | 6 ++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/routing/data_source.hpp b/routing/data_source.hpp index 8304138fa1..28fa89046f 100644 --- a/routing/data_source.hpp +++ b/routing/data_source.hpp @@ -46,6 +46,13 @@ public: : m_dataSource(dataSource), m_numMwmIDs(std::move(numMwmIDs)) {} + void FreeHandles() + { + m_features.release(); + m_handles.clear(); + m_handles2.clear(); + } + bool IsLoaded(platform::CountryFile const & file) const { return m_dataSource.IsLoaded(file); } enum SectionStatus diff --git a/routing/index_router.cpp b/routing/index_router.cpp index a2a861a42a..e3e6dc91b6 100644 --- a/routing/index_router.cpp +++ b/routing/index_router.cpp @@ -288,6 +288,7 @@ void IndexRouter::ClearState() { m_roadGraph.ClearState(); m_directionsEngine->Clear(); + m_dataSource.FreeHandles(); } bool IndexRouter::FindClosestProjectionToRoad(m2::PointD const & point, @@ -341,8 +342,9 @@ RouterResultCode IndexRouter::CalculateRoute(Checkpoints const & checkpoints, try { - SCOPE_GUARD(featureRoadGraphClear, [this]{ - this->ClearState(); + SCOPE_GUARD(featureRoadGraphClear, [this] + { + ClearState(); }); if (adjustToPrevRoute && m_lastRoute && m_lastFakeEdges &&