Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Fix algorithm compability check logic

Browse Source
This commit is contained in:
Patrick Niklaus 2017-03-01 00:13:17 +00:00 committed by Patrick Niklaus
parent 0ac1f99f9c
commit a901bda41e
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/engine/engine.hpp
View File

@ -149,13 +149,13 @@ template <> bool Engine<algorithm::CH>::CheckCompability(const EngineConfig &con
auto mem = storage::makeSharedMemory(barrier.data().region); auto mem = storage::makeSharedMemory(barrier.data().region);
auto layout = reinterpret_cast<storage::DataLayout *>(mem->Ptr()); auto layout = reinterpret_cast<storage::DataLayout *>(mem->Ptr());
return layout->GetBlockSize(storage::DataLayout::CH_GRAPH_NODE_LIST) > 0 && return layout->GetBlockSize(storage::DataLayout::CH_GRAPH_NODE_LIST) > 4 &&
layout->GetBlockSize(storage::DataLayout::CH_GRAPH_EDGE_LIST) > 0; layout->GetBlockSize(storage::DataLayout::CH_GRAPH_EDGE_LIST) > 4;
} }
else else
{ {
std::ifstream in(config.storage_config.hsgr_data_path.string().c_str()); std::ifstream in(config.storage_config.hsgr_data_path.string().c_str());
in.seekg(std::ios::end); in.seekg(0, std::ios::end);
auto size = in.tellg(); auto size = in.tellg();
return size > 0; return size > 0;
} }
@ -176,14 +176,16 @@ template <> bool Engine<algorithm::CoreCH>::CheckCompability(const EngineConfig
auto mem = storage::makeSharedMemory(barrier.data().region); auto mem = storage::makeSharedMemory(barrier.data().region);
auto layout = reinterpret_cast<storage::DataLayout *>(mem->Ptr()); auto layout = reinterpret_cast<storage::DataLayout *>(mem->Ptr());
return layout->GetBlockSize(storage::DataLayout::CH_CORE_MARKER) > 0; std::cout << layout->GetBlockSize(storage::DataLayout::CH_CORE_MARKER) << std::endl;
return layout->GetBlockSize(storage::DataLayout::CH_CORE_MARKER) > 4;
} }
else else
{ {
std::ifstream in(config.storage_config.core_data_path.string().c_str()); std::ifstream in(config.storage_config.core_data_path.string().c_str());
in.seekg(std::ios::end); in.seekg(0, std::ios::end);
auto size = in.tellg(); std::size_t size = in.tellg();
return size > 0; // An empty core files is only the 4 byte size header.
return size > sizeof(std::uint32_t);
} }
} }
} }

1
src/osrm/osrm.cpp
View File

@ -24,6 +24,7 @@ OSRM::OSRM(engine::EngineConfig &config)
} }
else else
{ {
// Will fail hard if there is no CH data
engine_ = std::make_unique<engine::Engine<engine::algorithm::CH>>(config); engine_ = std::make_unique<engine::Engine<engine::algorithm::CH>>(config);
} }
} }