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

[new downloader] Added more thread check points

Browse source
This commit is contained in:
Constantin Shalnev 2016-02-19 14:40:04 +03:00 • committed by Sergey Yershov
parent baf9743763
commit f185191c34
5 changed files with 72 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
map/framework.cpp
View file

@ -254,8 +254,8 @@ bool Framework::PreMigrate(ms::LatLon const & position,
if (currentCountryId == kInvalidCountryId)
return false;
Storage().m_prefetchStorage->Subscribe(change, progress);
Storage().m_prefetchStorage->DownloadNode(currentCountryId);
Storage().GetPrefetchStorage()->Subscribe(change, progress);
Storage().GetPrefetchStorage()->DownloadNode(currentCountryId);
return true;
}

2
qt/search_panel.cpp
View file

@ -219,7 +219,7 @@ bool SearchPanel::TryMigrate(QString const & str)
auto stateChanged = [&](storage::TCountryId const & id)
{
storage::Status const nextStatus = m_pDrawWidget->GetFramework().Storage().m_prefetchStorage->CountryStatusEx(id);
storage::Status const nextStatus = m_pDrawWidget->GetFramework().Storage().GetPrefetchStorage()->CountryStatusEx(id);
LOG_SHORT(LINFO, (id, "status :", nextStatus));
if (nextStatus == storage::Status::EOnDisk)
{

60
storage/storage.cpp
View file

@ -108,10 +108,17 @@ Storage::Storage(string const & referenceCountriesTxtJsonForTesting,
CHECK_LESS_OR_EQUAL(0, m_currentVersion, ("Can't load test countries file"));
}
void Storage::Init(TUpdate const & update) { m_update = update; }
void Storage::Init(TUpdate const & update)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
m_update = update;
}
void Storage::DeleteAllLocalMaps(TCountriesVec * existedCountries /* = nullptr */)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
for (auto const & localFiles : m_localFiles)
{
for (auto const & localFile : localFiles.second)
@ -127,11 +134,23 @@ void Storage::DeleteAllLocalMaps(TCountriesVec * existedCountries /* = nullptr *
bool Storage::HaveDownloadedCountries() const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
return !m_localFiles.empty();
}
Storage * Storage::GetPrefetchStorage()
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
ASSERT(m_prefetchStorage.get() != nullptr, ());
return m_prefetchStorage.get();
}
void Storage::PrefetchMigrateData()
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
m_prefetchStorage.reset(new Storage(COUNTRIES_MIGRATE_FILE, "migrate"));
m_prefetchStorage->Init([](LocalCountryFile const &){});
if (!m_downloadingUrlsForTesting.empty())
@ -140,6 +159,8 @@ void Storage::PrefetchMigrateData()
void Storage::Migrate(TCountriesVec const & existedCountries)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
platform::migrate::SetMigrationFlag();
Clear();
@ -187,6 +208,8 @@ void Storage::Clear()
void Storage::RegisterAllLocalMaps()
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
m_localFiles.clear();
m_localFilesForFakeCountries.clear();
@ -237,6 +260,8 @@ void Storage::RegisterAllLocalMaps()
void Storage::GetLocalMaps(vector<TLocalFilePtr> & maps) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
for (auto const & p : m_localFiles)
maps.push_back(GetLatestLocalFile(p.first));
@ -248,6 +273,8 @@ void Storage::GetLocalMaps(vector<TLocalFilePtr> & maps) const
size_t Storage::GetDownloadedFilesCount() const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
return m_localFiles.size();
}
@ -296,6 +323,8 @@ CountryFile const & Storage::GetCountryFile(TCountryId const & countryId) const
Storage::TLocalFilePtr Storage::GetLatestLocalFile(CountryFile const & countryFile) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
TCountryId const countryId = FindCountryIdByFile(countryFile.GetName());
if (IsCountryIdValid(countryId) && IsCoutryIdInCountryTree(countryId))
{
@ -313,6 +342,8 @@ Storage::TLocalFilePtr Storage::GetLatestLocalFile(CountryFile const & countryFi
Storage::TLocalFilePtr Storage::GetLatestLocalFile(TCountryId const & countryId) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
auto const it = m_localFiles.find(countryId);
if (it == m_localFiles.end() || it->second.empty())
return TLocalFilePtr();
@ -527,6 +558,8 @@ void Storage::DownloadNextFile(QueuedCountry const & country)
bool Storage::DeleteFromDownloader(TCountryId const & countryId)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
if (!DeleteCountryFilesFromDownloader(countryId, MapOptions::MapWithCarRouting))
return false;
NotifyStatusChanged(countryId);
@ -1007,6 +1040,8 @@ TCountryId const Storage::GetRootId() const
void Storage::GetChildren(TCountryId const & parent, TCountriesVec & childrenId) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
TCountriesContainer const * const parentNode = m_countries.FindFirst(Country(parent));
if (parentNode == nullptr)
{
@ -1023,6 +1058,8 @@ void Storage::GetChildren(TCountryId const & parent, TCountriesVec & childrenId)
void Storage::GetLocalRealMaps(TCountriesVec & localMaps) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
localMaps.clear();
localMaps.reserve(m_localFiles.size());
@ -1032,6 +1069,8 @@ void Storage::GetLocalRealMaps(TCountriesVec & localMaps) const
void Storage::GetDownloadedChildren(TCountryId const & parent, TCountriesVec & localChildren) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
TCountriesContainer const * const parentNode = m_countries.FindFirst(Country(parent));
if (parentNode == nullptr)
{
@ -1081,6 +1120,8 @@ void Storage::GetDownloadedChildren(TCountryId const & parent, TCountriesVec & l
bool Storage::IsNodeDownloaded(TCountryId const & countryId) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
for(auto const & localeMap : m_localFiles)
{
if (countryId == localeMap.first)
@ -1091,6 +1132,8 @@ bool Storage::IsNodeDownloaded(TCountryId const & countryId) const
void Storage::GetCountyListToDownload(TCountriesVec & countryList) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
TCountriesVec countryIds;
GetChildren(GetRootId(), countryIds);
// @TODO(bykoianko) Implement this method. Remove from this method fully downloaded maps.
@ -1098,6 +1141,8 @@ void Storage::GetCountyListToDownload(TCountriesVec & countryList) const
bool Storage::DownloadNode(TCountryId const & countryId)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
// @TODO(bykoianko) Before downloading it's necessary to check if file(s) has been downloaded.
// If so, the method should be left with false.
TCountriesContainer const * const node = m_countries.FindFirst(Country(countryId));
@ -1115,6 +1160,8 @@ bool Storage::DownloadNode(TCountryId const & countryId)
bool Storage::DeleteNode(TCountryId const & countryId)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
// @TODO(bykoianko) Before deleting it's necessary to check if file(s) has been deleted.
// If so, the method should be left with false.
TCountriesContainer const * const node = m_countries.FindFirst(Country(countryId));
@ -1155,6 +1202,8 @@ Status Storage::NodeStatus(TCountriesContainer const & node) const
void Storage::GetNodeAttrs(TCountryId const & countryId, NodeAttrs & nodeAttrs) const
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
vector<SimpleTree<Country> const *> nodes;
m_countries.Find(Country(countryId), nodes);
CHECK(!nodes.empty(), ());
@ -1186,8 +1235,17 @@ void Storage::GetNodeAttrs(TCountryId const & countryId, NodeAttrs & nodeAttrs)
}
}
void Storage::SetCallbackForClickOnDownloadMap(TDownloadFn & downloadFn)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
m_downloadMapOnTheMap = downloadFn;
}
void Storage::DoClickOnDownloadMap(TCountryId const & countryId)
{
ASSERT_THREAD_CHECKER(m_threadChecker, ());
if (m_downloadMapOnTheMap)
m_downloadMapOnTheMap(countryId);
}

12
storage/storage.hpp
View file

@ -162,6 +162,8 @@ private:
CountryNameGetter m_countryNameGetter;
unique_ptr<Storage> m_prefetchStorage;
DECLARE_THREAD_CHECKER(m_threadChecker);
void DownloadNextCountryFromQueue();
@ -326,7 +328,7 @@ public:
void UnsubscribeStatusCallback(size_t index) {}
/// \brief Sets callback which will be called in case of a click on download map button on the map.
void SetCallbackForClickOnDownloadMap(TDownloadFn & downloadFn) { m_downloadMapOnTheMap = downloadFn; }
void SetCallbackForClickOnDownloadMap(TDownloadFn & downloadFn);
/// \brief Calls |m_downloadMapOnTheMap| if one has been set.
/// \param |countryId| is country id of a leaf. That means it's a file name.
@ -342,13 +344,13 @@ public:
/// Do we have downloaded countries
bool HaveDownloadedCountries() const;
/// Prefetch MWMs before migrate
unique_ptr<Storage> m_prefetchStorage;
void PrefetchMigrateData();
/// Delete local maps and aggregate their Id if needed
void DeleteAllLocalMaps(TCountriesVec * existedCountries = nullptr);
/// Prefetch MWMs before migrate
Storage * GetPrefetchStorage();
void PrefetchMigrateData();
/// Switch on new storage version, remove old mwm
/// and add required mwm's into download queue.
void Migrate(TCountriesVec const & existedCountries);

6
storage/storage_integration_tests/migrate_tests.cpp
View file

@ -51,9 +51,9 @@ UNIT_TEST(StorageMigrationTests)
auto statePrefetchChanged = [&](TCountryId const & id)
{
Status const nextStatus = f.Storage().m_prefetchStorage->CountryStatusEx(id);
Status const nextStatus = f.Storage().GetPrefetchStorage()->CountryStatusEx(id);
LOG_SHORT(LINFO, (id, "status :", nextStatus));
if (!f.Storage().m_prefetchStorage->IsDownloadInProgress())
if (!f.Storage().GetPrefetchStorage()->IsDownloadInProgress())
{
LOG_SHORT(LINFO, ("All prefetched. Ready to migrate."));
testing::StopEventLoop();
@ -95,7 +95,7 @@ UNIT_TEST(StorageMigrationTests)
TEST_EQUAL(s.GetDownloadedFilesCount(), kPrefetchCountries.size(), ());
for (auto const & countryId : kPrefetchCountries)
TEST(s.m_prefetchStorage->IsNodeDownloaded(countryId), (countryId));
TEST(s.GetPrefetchStorage()->IsNodeDownloaded(countryId), (countryId));
f.Migrate();
// Wait for downloading complete.