drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[openlr] Modify openlr_stat to work with single data source

Browse Source 
Signed-off-by: mvglasow <michael -at- vonglasow.com>
This commit is contained in:
mvglasow
2025-05-16 22:57:08 +03:00
parent 74d79e5c8e
commit de03995e77
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
openlr/openlr_stat/openlr_stat.cpp
View File

@@ -56,8 +56,8 @@ int32_t const kMinNumThreads = 1;
int32_t const kMaxNumThreads = 128; int32_t const kMaxNumThreads = 128;
int32_t const kHandleAllSegments = -1; int32_t const kHandleAllSegments = -1;
void LoadDataSources(std::string const & pathToMWMFolder, void LoadDataSource(std::string const & pathToMWMFolder,
std::vector<FrozenDataSource> & dataSources) FrozenDataSource & dataSource)
{ {
CHECK(Platform::IsDirectory(pathToMWMFolder), (pathToMWMFolder, "must be a directory.")); CHECK(Platform::IsDirectory(pathToMWMFolder), (pathToMWMFolder, "must be a directory."));
@@ -66,8 +66,7 @@ void LoadDataSources(std::string const & pathToMWMFolder,
CHECK(!files.empty(), (pathToMWMFolder, "Contains no .mwm files.")); CHECK(!files.empty(), (pathToMWMFolder, "Contains no .mwm files."));
size_t const numDataSources = dataSources.size(); uint64_t numCountries;
std::vector<uint64_t> numCountries(numDataSources);
for (auto const & fileName : files) for (auto const & fileName : files)
{ {
@@ -81,15 +80,12 @@ void LoadDataSources(std::string const & pathToMWMFolder,
try try
{ {
localFile.SyncWithDisk(); localFile.SyncWithDisk();
for (size_t i = 0; i < numDataSources; ++i) auto const result = dataSource.RegisterMap(localFile);
{ CHECK_EQUAL(result.second, MwmSet::RegResult::Success, ("Can't register mwm:", localFile));
auto const result = dataSources[i].RegisterMap(localFile);
CHECK_EQUAL(result.second, MwmSet::RegResult::Success, ("Can't register mwm:", localFile));
auto const & info = result.first.GetInfo(); auto const & info = result.first.GetInfo();
if (info && info->GetType() == MwmInfo::COUNTRY) if (info && info->GetType() == MwmInfo::COUNTRY)
++numCountries[i]; ++numCountries;
}
} }
catch (RootException const & ex) catch (RootException const & ex)
{ {
@@ -97,11 +93,8 @@ void LoadDataSources(std::string const & pathToMWMFolder,
} }
} }
for (size_t i = 0; i < numDataSources; ++i) if (numCountries == 0)
{ LOG(LWARNING, ("No countries"));
if (numCountries[i] == 0)
LOG(LWARNING, ("No countries for thread", i));
}
} }
bool ValidateLimit(char const * flagname, int32_t value) bool ValidateLimit(char const * flagname, int32_t value)
@@ -257,11 +250,11 @@ int main(int argc, char * argv[])
auto const numThreads = static_cast<uint32_t>(FLAGS_num_threads); auto const numThreads = static_cast<uint32_t>(FLAGS_num_threads);
std::vector<FrozenDataSource> dataSources(numThreads); FrozenDataSource dataSource;
LoadDataSources(FLAGS_mwms_path, dataSources); LoadDataSource(FLAGS_mwms_path, dataSource);
OpenLRDecoder decoder(dataSources, storage::CountryParentGetter(FLAGS_countries_filename, OpenLRDecoder decoder(dataSource, storage::CountryParentGetter(FLAGS_countries_filename,
GetPlatform().ResourcesDir())); GetPlatform().ResourcesDir()));
pugi::xml_document document; pugi::xml_document document;