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

Fixed reading DataLayout from shared memory

Browse Source
This commit is contained in:
Patrick Niklaus 2018-03-26 15:01:48 +00:00 committed by Patrick Niklaus
parent 81929c984b
commit aec9b6a178
6 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/engine/engine.hpp
View File

@ -19,6 +19,9 @@
#include "engine/plugins/viaroute.hpp" #include "engine/plugins/viaroute.hpp"
#include "engine/routing_algorithms.hpp" #include "engine/routing_algorithms.hpp"
#include "engine/status.hpp" #include "engine/status.hpp"
#include "storage/serialization.hpp"
#include "util/exception.hpp" #include "util/exception.hpp"
#include "util/exception_utils.hpp" #include "util/exception_utils.hpp"
#include "util/fingerprint.hpp" #include "util/fingerprint.hpp"
@ -151,9 +154,11 @@ bool Engine<routing_algorithms::ch::Algorithm>::CheckCompatibility(const EngineC
boost::interprocess::scoped_lock<mutex_type> current_region_lock(barrier.get_mutex()); boost::interprocess::scoped_lock<mutex_type> current_region_lock(barrier.get_mutex());
auto mem = storage::makeSharedMemory(barrier.data().region); auto mem = storage::makeSharedMemory(barrier.data().region);
auto layout = reinterpret_cast<storage::DataLayout *>(mem->Ptr()); storage::DataLayout layout;
return layout->GetBlockSize("/ch/contracted_graph/node_array") > 4 && storage::io::BufferReader reader(reinterpret_cast<const char*>(mem->Ptr()), mem->Size());
layout->GetBlockSize("/ch/contracted_graph/edge_array") > 4; storage::serialization::read(reader, layout);
return layout.HasBlock("/ch/contracted_graph/node_array") &&
layout.HasBlock("/ch/contracted_graph/edge_array");
} }
else else
{ {
@ -171,21 +176,24 @@ bool Engine<routing_algorithms::mld::Algorithm>::CheckCompatibility(const Engine
boost::interprocess::scoped_lock<mutex_type> current_region_lock(barrier.get_mutex()); boost::interprocess::scoped_lock<mutex_type> current_region_lock(barrier.get_mutex());
auto mem = storage::makeSharedMemory(barrier.data().region); auto mem = storage::makeSharedMemory(barrier.data().region);
auto layout = reinterpret_cast<storage::DataLayout *>(mem->Ptr()); storage::DataLayout layout;
storage::io::BufferReader reader(reinterpret_cast<const char*>(mem->Ptr()), mem->Size());
storage::serialization::read(reader, layout);
// checks that all the needed memory blocks are populated // checks that all the needed memory blocks are populated
// "/mld/cellstorage/source_boundary" and "/mld/cellstorage/destination_boundary" // "/mld/cellstorage/source_boundary" and "/mld/cellstorage/destination_boundary"
// are not checked, because in situations where there are so few nodes in the graph that // are not checked, because in situations where there are so few nodes in the graph that
// they all fit into one cell, they can be empty. // they all fit into one cell, they can be empty.
bool empty_data = layout->GetBlockSize("/mld/multilevelpartition/level_data") > 0 && bool empty_data = layout.HasBlock("/mld/multilevelpartition/level_data") &&
layout->GetBlockSize("/mld/multilevelpartition/partition") > 0 && layout.HasBlock("/mld/multilevelpartition/partition") &&
layout->GetBlockSize("/mld/multilevelpartition/cell_to_children") > 0 && layout.HasBlock("/mld/multilevelpartition/cell_to_children") &&
layout->GetBlockSize("/mld/cellstorage/cells") > 0 && layout.HasBlock("/mld/cellstorage/cells") &&
layout->GetBlockSize("/mld/cellstorage/level_to_cell_offset") > 0 && layout.HasBlock("/mld/cellstorage/level_to_cell_offset") &&
layout->GetBlockSize("/mld/multilevelgraph/node_array") > 0 && layout.HasBlock("/mld/multilevelgraph/node_array") &&
layout->GetBlockSize("/mld/multilevelgraph/edge_array") > 0 && layout.HasBlock("/mld/multilevelgraph/edge_array") &&
layout->GetBlockSize("/mld/metrics/0/weights") > 0 && layout.HasBlock("/mld/metrics/0/weights") &&
layout->GetBlockSize("/mld/metrics/0/durations") > 0 && layout.HasBlock("/mld/metrics/0/durations") &&
layout->GetBlockSize("/mld/multilevelgraph/node_to_edge_offset") > 0; layout.HasBlock("/mld/multilevelgraph/node_to_edge_offset");
return empty_data; return empty_data;
} }
else else

2
include/storage/shared_datatype.hpp
View File

@ -71,6 +71,8 @@ class DataLayout
inline uint64_t GetBlockSize(const std::string &name) const { return GetBlock(name).byte_size; } inline uint64_t GetBlockSize(const std::string &name) const { return GetBlock(name).byte_size; }
inline bool HasBlock(const std::string &name) const { return blocks.find(name) != blocks.end(); }
inline uint64_t GetSizeOfLayout() const inline uint64_t GetSizeOfLayout() const
{ {
uint64_t result = 0; uint64_t result = 0;

2
include/storage/shared_memory.hpp
View File

@ -47,6 +47,7 @@ class SharedMemory
{ {
public: public:
void *Ptr() const { return region.get_address(); } void *Ptr() const { return region.get_address(); }
std::size_t Size() const { return region.get_size(); }
SharedMemory(const SharedMemory &) = delete; SharedMemory(const SharedMemory &) = delete;
SharedMemory &operator=(const SharedMemory &) = delete; SharedMemory &operator=(const SharedMemory &) = delete;
@ -200,6 +201,7 @@ class SharedMemory
public: public:
void *Ptr() const { return region.get_address(); } void *Ptr() const { return region.get_address(); }
std::size_t Size() const { return region.get_size(); }
SharedMemory(const boost::filesystem::path &lock_file, const int id, const uint64_t size = 0) SharedMemory(const boost::filesystem::path &lock_file, const int id, const uint64_t size = 0)
{ {

2
src/engine/datafacade/shared_memory_allocator.cpp
View File

@ -20,7 +20,7 @@ SharedMemoryAllocator::SharedMemoryAllocator(storage::SharedDataType data_region
BOOST_ASSERT(storage::SharedMemory::RegionExists(data_region)); BOOST_ASSERT(storage::SharedMemory::RegionExists(data_region));
m_large_memory = storage::makeSharedMemory(data_region); m_large_memory = storage::makeSharedMemory(data_region);
storage::io::BufferReader reader(GetMemory()); storage::io::BufferReader reader(reinterpret_cast<char *>(m_large_memory->Ptr()), m_large_memory->Size());
storage::serialization::read(reader, data_layout); storage::serialization::read(reader, data_layout);
layout_size = reader.GetPosition(); layout_size = reader.GetPosition();
util::Log(logDEBUG) << "Data layout has size " << layout_size; util::Log(logDEBUG) << "Data layout has size " << layout_size;

6
src/osrm/osrm.cpp
View File

@ -32,12 +32,6 @@ OSRM::OSRM(engine::EngineConfig &config)
storage::SharedMonitor<storage::SharedDataTimestamp> barrier; storage::SharedMonitor<storage::SharedDataTimestamp> barrier;
using mutex_type = typename decltype(barrier)::mutex_type; using mutex_type = typename decltype(barrier)::mutex_type;
boost::interprocess::scoped_lock<mutex_type> current_region_lock(barrier.get_mutex()); boost::interprocess::scoped_lock<mutex_type> current_region_lock(barrier.get_mutex());
auto mem = storage::makeSharedMemory(barrier.data().region);
auto layout = reinterpret_cast<storage::DataLayout *>(mem->Ptr());
if (layout->GetBlockSize("/common/names/values") == 0)
throw util::exception(
"No name data loaded, cannot continue. Have you run osrm-datastore to load data?");
} }
// Now, check that the algorithm requested can be used with the data // Now, check that the algorithm requested can be used with the data

1
src/storage/storage.cpp
View File

@ -165,6 +165,7 @@ int Storage::Run(int max_wait)
// Allocate shared memory block // Allocate shared memory block
auto regions_size = encoded_layout.size() + layout.GetSizeOfLayout(); auto regions_size = encoded_layout.size() + layout.GetSizeOfLayout();
util::Log() << "Data layout has a size of " << encoded_layout.size() << " bytes";
util::Log() << "Allocating shared memory of " << regions_size << " bytes"; util::Log() << "Allocating shared memory of " << regions_size << " bytes";
auto data_memory = makeSharedMemory(next_region, regions_size); auto data_memory = makeSharedMemory(next_region, regions_size);