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

[mwm set] Do not create MwmHandle instantly after registering map.

Browse source
This commit is contained in:
vng 2015-09-25 16:09:20 +03:00
parent 7629852c75
commit c56f4c20b9
15 changed files with 63 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
generator/routing_generator.cpp
View file

@ -272,7 +272,7 @@ void BuildRoutingIndex(string const & baseDir, string const & countryName, strin
}
FeatureType ft;
Index::FeaturesLoaderGuard loader(index, p.first.GetId());
Index::FeaturesLoaderGuard loader(index, p.first);
loader.GetFeatureByIndex(fID, ft);
ft.ParseGeometry(FeatureType::BEST_GEOMETRY);

2
indexer/index.cpp
View file

@ -63,7 +63,7 @@ unique_ptr<MwmSet::MwmValueBase> Index::CreateValue(MwmInfo & info) const
return unique_ptr<MwmSet::MwmValueBase>(move(p));
}
pair<MwmSet::MwmHandle, MwmSet::RegResult> Index::RegisterMap(LocalCountryFile const & localFile)
pair<MwmSet::MwmId, MwmSet::RegResult> Index::RegisterMap(LocalCountryFile const & localFile)
{
auto result = Register(localFile);
if (result.first.IsAlive() && result.second == MwmSet::RegResult::Success)

2
indexer/index.hpp
View file

@ -75,7 +75,7 @@ public:
/// Registers a new map.
WARN_UNUSED_RESULT pair<MwmHandle, RegResult> RegisterMap(
WARN_UNUSED_RESULT pair<MwmId, RegResult> RegisterMap(
platform::LocalCountryFile const & localFile);
/// Deregisters a map from internal records.

6
indexer/indexer_tests/index_test.cpp
View file

@ -113,7 +113,7 @@ UNIT_TEST(Index_MwmStatusNotifications)
TEST(p.first.IsAlive(), ());
TEST_EQUAL(MwmSet::RegResult::Success, p.second, ());
observer.CheckExpectations();
localFileV1Id = p.first.GetId();
localFileV1Id = p.first;
}
// Checks that map can't registered twice.
@ -122,7 +122,7 @@ UNIT_TEST(Index_MwmStatusNotifications)
TEST(p.first.IsAlive(), ());
TEST_EQUAL(MwmSet::RegResult::VersionAlreadyExists, p.second, ());
observer.CheckExpectations();
TEST_EQUAL(localFileV1Id, p.first.GetId(), ());
TEST_EQUAL(localFileV1Id, p.first, ());
}
// Checks that observers are notified when map is updated.
@ -134,7 +134,7 @@ UNIT_TEST(Index_MwmStatusNotifications)
TEST(p.first.IsAlive(), ());
TEST_EQUAL(MwmSet::RegResult::Success, p.second, ());
observer.CheckExpectations();
localFileV2Id = p.first.GetId();
localFileV2Id = p.first;
TEST_NOT_EQUAL(localFileV1Id, localFileV2Id, ());
}

2
indexer/indexer_tests/mwm_set_test.cpp
View file

@ -133,7 +133,7 @@ UNIT_TEST(MwmSetLockAndIdTest)
{
auto p = mwmSet.Register(LocalCountryFile::MakeForTesting("4"));
MwmSet::MwmHandle const & handle = p.first;
MwmSet::MwmHandle handle = mwmSet.GetMwmHandleById(p.first);
TEST(handle.IsAlive(), ());
TEST_EQUAL(MwmSet::RegResult::Success, p.second, ("Can't register test mwm 4"));
TEST_EQUAL(MwmInfo::STATUS_REGISTERED, handle.GetInfo()->GetStatus(), ());

12
indexer/mwm_set.cpp
View file

@ -83,7 +83,7 @@ MwmSet::MwmId MwmSet::GetMwmIdByCountryFileImpl(CountryFile const & countryFile)
return MwmId(it->second.back());
}
pair<MwmSet::MwmHandle, MwmSet::RegResult> MwmSet::Register(LocalCountryFile const & localFile)
pair<MwmSet::MwmId, MwmSet::RegResult> MwmSet::Register(LocalCountryFile const & localFile)
{
lock_guard<mutex> lock(m_lock);
@ -108,26 +108,26 @@ pair<MwmSet::MwmHandle, MwmSet::RegResult> MwmSet::Register(LocalCountryFile con
LOG(LINFO, ("Updating already registered mwm:", name));
info->SetStatus(MwmInfo::STATUS_REGISTERED);
info->m_file = localFile;
return make_pair(GetLock(id), RegResult::VersionAlreadyExists);
return make_pair(id, RegResult::VersionAlreadyExists);
}
LOG(LWARNING, ("Trying to add too old (", localFile.GetVersion(), ") mwm (", name,
"), current version:", info->GetVersion()));
return make_pair(MwmHandle(), RegResult::VersionTooOld);
return make_pair(MwmId(), RegResult::VersionTooOld);
}
pair<MwmSet::MwmHandle, MwmSet::RegResult> MwmSet::RegisterImpl(LocalCountryFile const & localFile)
pair<MwmSet::MwmId, MwmSet::RegResult> MwmSet::RegisterImpl(LocalCountryFile const & localFile)
{
// This function can throw an exception for a bad mwm file.
shared_ptr<MwmInfo> info(CreateInfo(localFile));
if (!info)
return make_pair(MwmHandle(), RegResult::UnsupportedFileFormat);
return make_pair(MwmId(), RegResult::UnsupportedFileFormat);
info->m_file = localFile;
info->SetStatus(MwmInfo::STATUS_REGISTERED);
m_info[localFile.GetCountryName()].push_back(info);
return make_pair(GetLock(MwmId(info)), RegResult::Success);
return make_pair(MwmId(info), RegResult::Success);
}
bool MwmSet::DeregisterImpl(MwmId const & id)

4
indexer/mwm_set.hpp
View file

@ -164,11 +164,11 @@ public:
/// are older than the localFile (in this case mwm handle will point
/// to just-registered file).
protected:
WARN_UNUSED_RESULT pair<MwmHandle, RegResult> RegisterImpl(
WARN_UNUSED_RESULT pair<MwmId, RegResult> RegisterImpl(
platform::LocalCountryFile const & localFile);
public:
WARN_UNUSED_RESULT pair<MwmHandle, RegResult> Register(
WARN_UNUSED_RESULT pair<MwmId, RegResult> Register(
platform::LocalCountryFile const & localFile);
//@}

17
map/feature_vec_model.cpp
View file

@ -44,7 +44,7 @@ void FeaturesFetcher::InitClassificator()
}
}
pair<MwmSet::MwmHandle, MwmSet::RegResult> FeaturesFetcher::RegisterMap(
pair<MwmSet::MwmId, MwmSet::RegResult> FeaturesFetcher::RegisterMap(
LocalCountryFile const & localFile)
{
try
@ -54,17 +54,20 @@ pair<MwmSet::MwmHandle, MwmSet::RegResult> FeaturesFetcher::RegisterMap(
{
LOG(LWARNING, ("Can't add map", localFile.GetCountryName(),
"Probably it's already added or has newer data version."));
return result;
}
MwmSet::MwmHandle & handle = result.first;
ASSERT(handle.IsAlive(), ("Mwm lock invariant violation."));
m_rect.Add(handle.GetInfo()->m_limitRect);
else
{
MwmSet::MwmId const & id = result.first;
ASSERT(id.IsAlive(), ());
m_rect.Add(id.GetInfo()->m_limitRect);
}
return result;
}
catch (RootException const & ex)
{
LOG(LERROR, ("IO error while adding ", localFile.GetCountryName(), " map. ", ex.Msg()));
return make_pair(MwmSet::MwmHandle(), MwmSet::RegResult::BadFile);
LOG(LERROR, ("IO error while adding", localFile.GetCountryName(), "map.", ex.Msg()));
return make_pair(MwmSet::MwmId(), MwmSet::RegResult::BadFile);
}
}

2
map/feature_vec_model.hpp
View file

@ -46,7 +46,7 @@ class FeaturesFetcher : public Index::Observer
}
/// Registers a new map.
WARN_UNUSED_RESULT pair<MwmSet::MwmHandle, MwmSet::RegResult> RegisterMap(
WARN_UNUSED_RESULT pair<MwmSet::MwmId, MwmSet::RegResult> RegisterMap(
platform::LocalCountryFile const & localFile);
/// Deregisters a map denoted by file from internal records.

16
map/framework.cpp
View file

@ -102,7 +102,7 @@ namespace
char const kRouterTypeKey[] = "router";
}
pair<MwmSet::MwmHandle, MwmSet::RegResult> Framework::RegisterMap(
pair<MwmSet::MwmId, MwmSet::RegResult> Framework::RegisterMap(
LocalCountryFile const & localFile)
{
LOG(LINFO, ("Loading map:", localFile.GetCountryName()));
@ -447,10 +447,10 @@ void Framework::UpdateLatestCountryFile(LocalCountryFile const & localFile)
return;
// Add downloaded map.
auto result = m_model.RegisterMap(localFile);
MwmSet::MwmHandle const & handle = result.first;
if (handle.IsAlive())
InvalidateRect(handle.GetInfo()->m_limitRect, true /* doForceUpdate */);
auto p = m_model.RegisterMap(localFile);
MwmSet::MwmId const & id = p.first;
if (id.IsAlive())
InvalidateRect(id.GetInfo()->m_limitRect, true /* doForceUpdate */);
GetSearchEngine()->ClearViewportsCache();
}
@ -479,9 +479,9 @@ void Framework::RegisterAllMaps()
if (p.second != MwmSet::RegResult::Success)
continue;
MwmSet::MwmHandle const & handle = p.first;
ASSERT(handle.IsAlive(), ());
minFormat = min(minFormat, static_cast<int>(handle.GetInfo()->m_version.format));
MwmSet::MwmId const & id = p.first;
ASSERT(id.IsAlive(), ());
minFormat = min(minFormat, static_cast<int>(id.GetInfo()->m_version.format));
}
m_countryTree.Init(maps);

2
map/framework.hpp
View file

@ -203,7 +203,7 @@ public:
void DeregisterAllMaps();
/// Registers a local map file in internal indexes.
pair<MwmSet::MwmHandle, MwmSet::RegResult> RegisterMap(
pair<MwmSet::MwmId, MwmSet::RegResult> RegisterMap(
platform::LocalCountryFile const & localFile);
//@}

7
map/mwm_tests/mwm_index_test.cpp
View file

@ -42,10 +42,11 @@ bool RunTest(string const & countryFileName, int lowS, int highS)
auto p = src.RegisterMap(platform::LocalCountryFile::MakeForTesting(countryFileName));
if (p.second != MwmSet::RegResult::Success)
return false;
MwmSet::MwmHandle const & handle = p.first;
ASSERT(handle.IsAlive(), ());
version::Format const version = handle.GetInfo()->m_version.format;
MwmSet::MwmId const & id = p.first;
ASSERT(id.IsAlive(), ());
version::Format const version = id.GetInfo()->m_version.format;
if (version == version::unknownFormat)
return false;

12
routing/routing_tests/routing_mapping_test.cpp
View file

@ -63,7 +63,7 @@ private:
ScopedFile m_testRoutingFile;
LocalCountryFile m_localFile;
TestMwmSet m_testSet;
pair<MwmSet::MwmHandle, MwmSet::RegResult> m_result;
pair<MwmSet::MwmId, MwmSet::RegResult> m_result;
};
UNIT_TEST(RoutingMappingCountryFileLockTest)
@ -72,10 +72,10 @@ UNIT_TEST(RoutingMappingCountryFileLockTest)
{
RoutingMapping testMapping(generator.GetCountryName(), (&generator.GetMwmSet()));
TEST(testMapping.IsValid(), ());
TEST_EQUAL(generator.GetNumRefs(), 2, ());
TEST_EQUAL(generator.GetNumRefs(), 1, ());
}
// Routing mapping must unlock the file after destruction.
TEST_EQUAL(generator.GetNumRefs(), 1, ());
TEST_EQUAL(generator.GetNumRefs(), 0, ());
}
UNIT_TEST(IndexManagerLockManagementTest)
@ -87,13 +87,13 @@ UNIT_TEST(IndexManagerLockManagementTest)
{
auto testMapping = manager.GetMappingByName(fileName);
TEST(testMapping->IsValid(), ());
TEST_EQUAL(generator.GetNumRefs(), 2, ());
TEST_EQUAL(generator.GetNumRefs(), 1, ());
}
// We freed mapping, but it still persists inside the manager cache.
TEST_EQUAL(generator.GetNumRefs(), 2, ());
TEST_EQUAL(generator.GetNumRefs(), 1, ());
// Test cache clearing.
manager.Clear();
TEST_EQUAL(generator.GetNumRefs(), 1, ());
TEST_EQUAL(generator.GetNumRefs(), 0, ());
}
} // namespace

30
search/integration_tests/retrieval_test.cpp
View file

@ -108,8 +108,8 @@ UNIT_TEST(Retrieval_Smoke)
Index index;
auto p = index.RegisterMap(file);
auto & handle = p.first;
TEST(handle.IsAlive(), ());
auto & id = p.first;
TEST(id.IsAlive(), ());
TEST_EQUAL(p.second, MwmSet::RegResult::Success, ());
search::SearchQueryParams params;
@ -122,7 +122,7 @@ UNIT_TEST(Retrieval_Smoke)
// Retrieve all (100) whiskey bars from the mwm.
{
TestCallback callback(handle.GetId());
TestCallback callback(id);
retrieval.Init(index, infos, m2::RectD(m2::PointD(0, 0), m2::PointD(1, 1)), params,
search::Retrieval::Limits());
@ -130,14 +130,14 @@ UNIT_TEST(Retrieval_Smoke)
TEST(callback.WasTriggered(), ());
TEST_EQUAL(100, callback.Offsets().size(), ());
TestCallback dummyCallback(handle.GetId());
TestCallback dummyCallback(id);
retrieval.Go(dummyCallback);
TEST(!dummyCallback.WasTriggered(), ());
}
// Retrieve all whiskey bars from the left-bottom 5 x 5 square.
{
TestCallback callback(handle.GetId());
TestCallback callback(id);
search::Retrieval::Limits limits;
limits.SetMaxViewportScale(9.0);
@ -150,7 +150,7 @@ UNIT_TEST(Retrieval_Smoke)
// Retrieve exactly 8 whiskey bars from the center.
{
TestCallback callback(handle.GetId());
TestCallback callback(id);
search::Retrieval::Limits limits;
limits.SetMaxNumFeatures(8);
@ -192,17 +192,17 @@ UNIT_TEST(Retrieval_3Mwms)
Index index;
auto mskP = index.RegisterMap(msk);
auto & mskHandle = mskP.first;
auto & mskId = mskP.first;
auto mtvP = index.RegisterMap(mtv);
auto & mtvHandle = mtvP.first;
auto & mtvId = mtvP.first;
auto zrhP = index.RegisterMap(zrh);
auto & zrhHandle = zrhP.first;
auto & zrhId = zrhP.first;
TEST(mskHandle.IsAlive(), ());
TEST(mtvHandle.IsAlive(), ());
TEST(zrhHandle.IsAlive(), ());
TEST(mskId.IsAlive(), ());
TEST(mtvId.IsAlive(), ());
TEST(zrhId.IsAlive(), ());
search::SearchQueryParams params;
InitParams("mtv", params);
@ -213,7 +213,7 @@ UNIT_TEST(Retrieval_3Mwms)
search::Retrieval retrieval;
{
TestCallback callback(mskHandle.GetId());
TestCallback callback(mskId);
search::Retrieval::Limits limits;
limits.SetMaxNumFeatures(1);
@ -225,7 +225,7 @@ UNIT_TEST(Retrieval_3Mwms)
}
{
MultiMwmCallback callback({mskHandle.GetId(), mtvHandle.GetId(), zrhHandle.GetId()});
MultiMwmCallback callback({mskId, mtvId, zrhId});
search::Retrieval::Limits limits;
limits.SetMaxNumFeatures(10 /* more than total number of features in all these mwms */);
@ -237,7 +237,7 @@ UNIT_TEST(Retrieval_3Mwms)
}
{
MultiMwmCallback callback({mskHandle.GetId(), mtvHandle.GetId(), zrhHandle.GetId()});
MultiMwmCallback callback({mskId, mtvId, zrhId});
search::Retrieval::Limits limits;
retrieval.Init(index, infos, m2::RectD(m2::PointD(-1.0, -1.0), m2::PointD(1.0, 1.0)), params,

6
search/search_tests/locality_finder_test.cpp
View file

@ -59,10 +59,10 @@ UNIT_TEST(LocalityFinder)
auto const p = index.Register(world);
TEST_EQUAL(MwmSet::RegResult::Success, p.second, ());
MwmSet::MwmHandle const & handle = p.first;
TEST(handle.IsAlive(), ());
MwmSet::MwmId const & id = p.first;
TEST(id.IsAlive(), ());
rect = handle.GetId().GetInfo()->m_limitRect;
rect = id.GetInfo()->m_limitRect;
}
catch (RootException const & ex)
{