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

Do correct and full cache clearing (for Index and search::Engine).

Browse source
This commit is contained in:
vng 2012-10-18 02:19:11 +03:00 • committed by Alex Zolotarev
parent b02b5b055f
commit 20e3ed1758
4 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
map/framework.cpp
View file

@ -866,12 +866,15 @@ void Framework::DisablePlacemark()
m_drawPlacemark = false;
}
void Framework::ClearAllCaches()
{
m_model.ClearCaches();
GetSearchEngine()->ClearAllCaches();
}
void Framework::MemoryWarning()
{
// clearing caches on memory warning.
m_model.ClearCaches();
GetSearchEngine()->ClearCaches();
ClearAllCaches();
LOG(LINFO, ("MemoryWarning"));
}
@ -882,8 +885,11 @@ void Framework::MemoryWarning()
void Framework::EnterBackground()
{
// clearing caches on entering background.
m_model.ClearCaches();
// Do not clear caches for Android. This function is called when main activity is paused,
// but at the same time search activity (for example) is enabled.
#ifndef OMIM_OS_ANDROID
ClearAllCaches();
#endif
double val = 0;
(void)Settings::Get(FOREGROUND_TIME_SETTINGS, val);

2
map/framework.hpp
View file

@ -143,6 +143,8 @@ protected:
BenchmarkEngine * m_benchmarkEngine;
void ClearAllCaches();
public:
Framework();
virtual ~Framework();

8
search/search_engine.cpp
View file

@ -346,10 +346,12 @@ void Engine::ClearViewportsCache()
m_pQuery->ClearCaches();
}
void Engine::ClearCaches()
void Engine::ClearAllCaches()
{
/// @todo Add m_pData->m_infoGetter clearing routine.
/// Now we have prereserved cache size.
threads::MutexGuard guard(m_searchMutex);
m_pQuery->ClearCaches();
m_pData->m_infoGetter.ClearCaches();
}
} // namespace search

2
search/search_engine.hpp
View file

@ -56,7 +56,7 @@ public:
m2::RectD GetCountryBounds(string const & file) const;
void ClearViewportsCache();
void ClearCaches();
void ClearAllCaches();
private:
static const int RESULTS_COUNT = 15;