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

Merge pull request #35 from vng/android

Browse source 
Mwm registering.
This commit is contained in:
ygorshenin 2015-09-25 19:15:45 +03:00
commit e24aba7739
31 changed files with 198 additions and 160 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
android/jni/com/mapswithme/core/logging.cpp
View file

@ -1,8 +1,5 @@
#include "logging.hpp"
#include <android/log.h>
#include <cassert>
#include "base/exception.hpp"
#include "base/logging.hpp"
@ -11,17 +8,21 @@
#include "platform/file_logging.hpp"
#include "platform/platform.hpp"
#include <android/log.h>
#include <cassert>
#include <cstdlib>
namespace jni
{
using namespace my;
void AndroidLogMessage(LogLevel l, SrcPoint const & src, string const & s)
void AndroidMessage(LogLevel level, SrcPoint const & src, string const & s)
{
android_LogPriority pr = ANDROID_LOG_SILENT;
switch (l)
switch (level)
{
case LINFO: pr = ANDROID_LOG_INFO; break;
case LDEBUG: pr = ANDROID_LOG_DEBUG; break;
@ -34,24 +35,30 @@ void AndroidLogMessage(LogLevel l, SrcPoint const & src, string const & s)
__android_log_write(pr, "MapsWithMe_JNI", out.c_str());
}
void AndroidLogMessage(LogLevel level, SrcPoint const & src, string const & s)
{
AndroidMessage(level, src, s);
CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level));
}
void AndroidAssertMessage(SrcPoint const & src, string const & s)
{
#if defined(MWM_LOG_TO_FILE)
LogMessageFile(LERROR, src, s);
#ifdef MWM_LOG_TO_FILE
LogMessageFile(LCRITICAL, src, s);
#else
AndroidLogMessage(LERROR, src, s);
AndroidMessage(LCRITICAL, src, s);
#endif
#ifdef DEBUG
assert(false);
assert(false);
#else
MYTHROW(RootException, (s));
std::abort();
#endif
}
void InitSystemLog()
{
#if defined(MWM_LOG_TO_FILE)
#ifdef MWM_LOG_TO_FILE
SetLogMessageFn(&LogMessageFile);
#else
SetLogMessageFn(&AndroidLogMessage);

18
base/base.cpp
View file

@ -6,29 +6,21 @@
#include "std/iostream.hpp"
#include <cassert>
#include <cstdlib>
#ifdef OMIM_OS_TIZEN
#include <FBaseSys.h>
#endif
namespace my
{
void OnAssertFailedDefault(SrcPoint const & srcPoint, string const & msg)
{
#ifdef OMIM_OS_TIZEN
AppLog("ASSERT FAILED%s:%d:%s", srcPoint.FileName(), srcPoint.Line(), msg.c_str());
AppAssert(false);
#else
std::cerr << "ASSERT FAILED\n" << srcPoint.FileName() << ":" << srcPoint.Line() << "\n"
<< msg << endl;
std::cerr << "ASSERT FAILED" << endl
<< srcPoint.FileName() << ":" << srcPoint.Line() << endl
<< msg << endl;
#ifdef DEBUG
assert(false);
#else
MYTHROW(RootException, (msg));
#endif
std::abort();
#endif
}

68
base/logging.cpp
View file

@ -1,12 +1,12 @@
#include "base/assert.hpp"
#include "base/logging.hpp"
#include "base/macros.hpp"
#include "base/timer.hpp"
#include "base/thread.hpp"
#include "base/mutex.hpp"
#include "base/thread.hpp"
#include "base/timer.hpp"
#include "std/iostream.hpp"
#include "std/iomanip.hpp"
#include "std/iostream.hpp"
#include "std/mutex.hpp"
#include "std/sstream.hpp"
#include "std/target_os.hpp"
@ -15,41 +15,6 @@
namespace my
{
void LogCheckIfErrorLevel(LogLevel level)
{
#ifdef DEBUG
if (level >= LERROR)
#else
if (level >= LCRITICAL)
#endif
{
CHECK(false, ("Error level is too serious", level));
}
}
#ifdef OMIM_OS_TIZEN
#include <FBaseLog.h>
void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, string const & msg)
{
ostringstream out;
out << DebugPrint(srcPoint) << msg << endl;
switch (level)
{
case LDEBUG:
AppLogDebug(out.str().c_str());
break;
case LINFO:
case LWARNING:
AppLog(out.str().c_str());
break;
case LERROR:
case LCRITICAL:
AppLogException(out.str().c_str());
}
}
#else
class LogHelper
{
int m_threadsCount;
@ -69,8 +34,6 @@ namespace my
size_t m_lens[5];
public:
threads::Mutex m_mutex;
LogHelper() : m_threadsCount(0)
{
m_names[0] = "DEBUG"; m_lens[0] = 5;
@ -92,39 +55,34 @@ namespace my
}
};
mutex g_logMutex;
void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, string const & msg)
{
static LogHelper logger;
lock_guard<mutex> lock(g_logMutex);
threads::MutexGuard guard(logger.m_mutex);
UNUSED_VALUE(guard);
static LogHelper logger;
ostringstream out;
logger.WriteProlog(out, level);
out << DebugPrint(srcPoint) << msg << endl;
std::cerr << out.str();
CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level));
}
void LogMessageTests(LogLevel level, SrcPoint const & srcPoint, string const & msg)
void LogMessageTests(LogLevel level, SrcPoint const &, string const & msg)
{
static mutex mtx;
lock_guard<mutex> lock(mtx);
lock_guard<mutex> lock(g_logMutex);
ostringstream out;
out << msg << endl;
std::cerr << out.str();
#ifdef OMIM_OS_WINDOWS
OutputDebugStringA(out.str().c_str());
#endif
LogCheckIfErrorLevel(level);
CHECK_LESS(level, g_LogAbortLevel, ("Abort. Log level is too serious", level));
}
#endif
LogMessageFn LogMessage = &LogMessageDefault;
LogMessageFn SetLogMessageFn(LogMessageFn fn)
@ -135,7 +93,9 @@ namespace my
#ifdef DEBUG
LogLevel g_LogLevel = LDEBUG;
LogLevel g_LogAbortLevel = LERROR;
#else
LogLevel g_LogLevel = LINFO;
LogLevel g_LogAbortLevel = LCRITICAL;
#endif
}

3
base/logging.hpp
View file

@ -18,9 +18,12 @@ namespace my
extern LogMessageFn LogMessage;
extern LogLevel g_LogLevel;
extern LogLevel g_LogAbortLevel;
/// @return Pointer to previous message function.
LogMessageFn SetLogMessageFn(LogMessageFn fn);
void LogMessageDefault(LogLevel level, SrcPoint const & srcPoint, string const & msg);
void LogMessageTests(LogLevel level, SrcPoint const & srcPoint, string const & msg);
}

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/features_offsets_table.cpp
View file

@ -71,7 +71,7 @@ namespace feature
{
LOG(LINFO, ("Creating features offset table file", storePath));
VERIFY(CountryIndexes::PreparePlaceOnDisk(localFile), ());
CountryIndexes::PreparePlaceOnDisk(localFile);
Builder builder;
FeaturesVector::ForEachOffset(cont.GetReader(DATA_FILE_TAG), [&builder] (uint32_t offset)

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)

4
indexer/index.hpp
View file

@ -73,10 +73,8 @@ public:
virtual void OnMapDeregistered(platform::LocalCountryFile const & localFile) {}
};
/// Registers a new map.
WARN_UNUSED_RESULT pair<MwmHandle, RegResult> RegisterMap(
platform::LocalCountryFile const & localFile);
pair<MwmId, RegResult> RegisterMap(platform::LocalCountryFile const & localFile);
/// Deregisters a map from internal records.
///

2
indexer/indexer_tests/features_offsets_table_test.cpp
View file

@ -97,7 +97,7 @@ namespace feature
FilesContainerR baseContainer(pl.GetReader("minsk-pass" DATA_FILE_EXTENSION));
LocalCountryFile localFile = LocalCountryFile::MakeForTesting(testFileName);
TEST(CountryIndexes::PreparePlaceOnDisk(localFile), ());
CountryIndexes::PreparePlaceOnDisk(localFile);
string const indexFile = CountryIndexes::GetPath(localFile, CountryIndexes::Index::Offsets);
FileWriter::DeleteFileX(indexFile);

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(), ());

26
indexer/mwm_set.cpp
View file

@ -4,6 +4,7 @@
#include "defines.hpp"
#include "base/assert.hpp"
#include "base/exception.hpp"
#include "base/logging.hpp"
#include "base/stl_add.hpp"
@ -83,7 +84,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 +109,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)
@ -214,7 +215,18 @@ unique_ptr<MwmSet::MwmValueBase> MwmSet::LockValueImpl(MwmId const & id)
}
}
return CreateValue(*info);
try
{
return CreateValue(*info);
}
catch (exception const & ex)
{
LOG(LERROR, ("Can't create MWMValue for", info->GetCountryName(), "Reason", ex.what()));
--info->m_numRefs;
DeregisterImpl(id);
return nullptr;
}
}
void MwmSet::UnlockValue(MwmId const & id, unique_ptr<MwmValueBase> && p)

6
indexer/mwm_set.hpp
View file

@ -164,12 +164,10 @@ 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(
platform::LocalCountryFile const & localFile);
pair<MwmId, RegResult> RegisterImpl(platform::LocalCountryFile const & localFile);
public:
WARN_UNUSED_RESULT pair<MwmHandle, RegResult> Register(
platform::LocalCountryFile const & localFile);
pair<MwmId, RegResult> Register(platform::LocalCountryFile const & localFile);
//@}
/// @name Remove mwm.

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(
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);
//@}

1
map/map_tests/map_tests.pro
View file

@ -36,6 +36,7 @@ SOURCES += \
kmz_unarchive_test.cpp \
mwm_url_tests.cpp \
navigator_test.cpp \
mwm_set_test.cpp \
!linux* {
SOURCES += working_time_tests.cpp \

58
map/map_tests/mwm_set_test.cpp Normal file
View file

@ -0,0 +1,58 @@
#include "testing/testing.hpp"
#include "indexer/index.hpp"
#include "platform/local_country_file_utils.hpp"
#include "platform/platform.hpp"
#include "base/scope_guard.hpp"
#ifndef OMIM_OS_WINDOWS
#include <sys/stat.h>
#endif
using namespace platform;
using namespace my;
#ifndef OMIM_OS_WINDOWS
UNIT_TEST(MwmSet_FileSystemErrors)
{
string const dir = GetPlatform().WritableDir();
CountryFile file("minsk-pass");
LocalCountryFile localFile(dir, file, 0);
TEST(CountryIndexes::DeleteFromDisk(localFile), ());
// Maximum level to check exception handling logic.
LogLevel oldLevel = g_LogAbortLevel;
g_LogAbortLevel = LCRITICAL;
// Remove writable permission.
int const readOnlyMode = S_IRUSR | S_IRGRP | S_IROTH | S_IXUSR | S_IXGRP | S_IXOTH;
TEST_EQUAL(chmod(dir.c_str(), readOnlyMode), 0, ());
auto restoreFn = [oldLevel, &dir, readOnlyMode] ()
{
g_LogAbortLevel = oldLevel;
TEST_EQUAL(chmod(dir.c_str(), readOnlyMode | S_IWUSR), 0, ());
};
MY_SCOPE_GUARD(restoreGuard, restoreFn);
Index index;
auto p = index.RegisterMap(localFile);
TEST_EQUAL(p.second, Index::RegResult::Success, ());
// Registering should pass ok.
TEST(index.GetMwmIdByCountryFile(file) != Index::MwmId(), ());
// Getting handle causes feature offsets index building which should fail
// because of write permissions.
TEST(!index.GetMwmHandleById(p.first).IsAlive(), ());
// Map is automatically deregistered after the fail.
vector<shared_ptr<MwmInfo>> infos;
index.GetMwmsInfo(infos);
TEST(infos.empty(), ());
}
#endif

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;

11
platform/local_country_file_utils.cpp
View file

@ -239,9 +239,11 @@ ModelReader * GetCountryReader(platform::LocalCountryFile const & file, MapOptio
}
// static
bool CountryIndexes::PreparePlaceOnDisk(LocalCountryFile const & localFile)
void CountryIndexes::PreparePlaceOnDisk(LocalCountryFile const & localFile)
{
return MkDirChecked(IndexesDir(localFile));
string const dir = IndexesDir(localFile);
if (!MkDirChecked(dir))
MYTHROW(FileSystemException, ("Can't create directory", dir));
}
// static
@ -302,6 +304,8 @@ string CountryIndexes::IndexesDir(LocalCountryFile const & localFile)
string dir = localFile.GetDirectory();
CountryFile const & file = localFile.GetCountryFile();
/// @todo It's a temporary code until we will put fIndex->fOffset into mwm container.
/// IndexesDir should not throw any exceptions.
if (dir.empty())
{
// Local file is stored in resources. Need to prepare index folder in the writable directory.
@ -309,7 +313,8 @@ string CountryIndexes::IndexesDir(LocalCountryFile const & localFile)
ASSERT_GREATER(version, 0, ());
dir = my::JoinFoldersToPath(GetPlatform().WritableDir(), strings::to_string(version));
VERIFY(MkDirChecked(dir), ());
if (!MkDirChecked(dir))
MYTHROW(FileSystemException, ("Can't create directory", dir));
}
return my::JoinFoldersToPath(dir, file.GetNameWithoutExt());

8
platform/local_country_file_utils.hpp
View file

@ -62,10 +62,10 @@ public:
Offsets
};
// Prepares (if necessary) directory for country indexes. Local file
// should point to existing local country files. Returns true on
// success, false otherwise.
static bool PreparePlaceOnDisk(LocalCountryFile const & localFile);
/// Prepares (if necessary) directory for country indexes. Local file
/// should point to existing local country files.
/// @throw FileSystemException if any file system error occured.
static void PreparePlaceOnDisk(LocalCountryFile const & localFile);
// Removes country indexes from disk including containing directory.
static bool DeleteFromDisk(LocalCountryFile const & localFile);

2
platform/platform.hpp
View file

@ -15,7 +15,7 @@
#include "defines.hpp"
DECLARE_EXCEPTION(FileAbsentException, RootException);
DECLARE_EXCEPTION(NotImplementedException, RootException);
DECLARE_EXCEPTION(FileSystemException, RootException);
namespace platform
{

2
platform/platform_android.cpp
View file

@ -182,7 +182,7 @@ ModelReader * Platform::GetReader(string const & file, string const & searchScop
}
}
LOG(LERROR, ("Can't get reader for:", file));
LOG(LWARNING, ("Can't get reader for:", file));
MYTHROW(FileAbsentException, ("File not found", file));
return 0;
}

6
platform/platform_tests/local_country_file_tests.cpp
View file

@ -313,8 +313,7 @@ UNIT_TEST(LocalCountryFile_CountryIndexes)
TEST_EQUAL(
my::JoinFoldersToPath(germanyLocalFile.GetDirectory(), germanyFile.GetNameWithoutExt()),
CountryIndexes::IndexesDir(germanyLocalFile), ());
TEST(CountryIndexes::PreparePlaceOnDisk(germanyLocalFile),
("Can't prepare place for:", germanyLocalFile));
CountryIndexes::PreparePlaceOnDisk(germanyLocalFile);
string const bitsPath = CountryIndexes::GetPath(germanyLocalFile, CountryIndexes::Index::Bits);
TEST(!Platform::IsFileExistsByFullPath(bitsPath), (bitsPath));
@ -344,9 +343,8 @@ UNIT_TEST(LocalCountryFile_DoNotDeleteUserFiles)
CountryFile germanyFile("Germany");
LocalCountryFile germanyLocalFile(testDir.GetFullPath(), germanyFile, 101010 /* version */);
CountryIndexes::PreparePlaceOnDisk(germanyLocalFile);
TEST(CountryIndexes::PreparePlaceOnDisk(germanyLocalFile),
("Can't prepare place for:", germanyLocalFile));
string const userFilePath =
my::JoinFoldersToPath(CountryIndexes::IndexesDir(germanyLocalFile), "user-data.txt");
{

5
routing/cross_routing_context.cpp
View file

@ -57,7 +57,9 @@ size_t CrossRoutingContextReader::GetIndexInAdjMatrix(IngoingEdgeIteratorT ingoi
void CrossRoutingContextReader::Load(Reader const & r)
{
size_t size, pos = 0;
size_t pos = 0;
uint32_t size;
r.Read(pos, &size, sizeof(size));
pos += sizeof(size);
m_ingoingNodes.resize(size);
@ -81,7 +83,6 @@ void CrossRoutingContextReader::Load(Reader const & r)
pos += sizeof(strsize);
for (uint32_t i = 0; i < strsize; ++i)
{
vector<char> tmpString;
r.Read(pos, &size, sizeof(size));
pos += sizeof(size);
vector<char> buffer(size);

1
routing/osrm2feature_map.cpp
View file

@ -388,6 +388,7 @@ void OsrmFtSegBackwardIndex::Construct(OsrmFtSegMapping & mapping, uint32_t maxN
if (m_oldFormat)
LOG(LINFO, ("Using old format index for", localFile.GetCountryName()));
CountryIndexes::PreparePlaceOnDisk(localFile);
string const bitsFileName = CountryIndexes::GetPath(localFile, CountryIndexes::Index::Bits);
string const nodesFileName = CountryIndexes::GetPath(localFile, CountryIndexes::Index::Nodes);

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)
{

2
storage/storage_tests/storage_tests.cpp
View file

@ -598,7 +598,7 @@ UNIT_TEST(StorageTest_DeleteCountry)
LocalCountryFile file = LocalCountryFile::MakeForTesting("Wonderland");
TEST_EQUAL(MapOptions::MapWithCarRouting, file.GetFiles(), ());
TEST(CountryIndexes::PreparePlaceOnDisk(file), ());
CountryIndexes::PreparePlaceOnDisk(file);
string const bitsPath = CountryIndexes::GetPath(file, CountryIndexes::Index::Bits);
{
FileWriter writer(bitsPath);