Fixed reading DataLayout from shared memory

src/engine/datafacade/shared_memory_allocator.cpp

@@ -20,7 +20,7 @@ SharedMemoryAllocator::SharedMemoryAllocator(storage::SharedDataType data_region
     BOOST_ASSERT(storage::SharedMemory::RegionExists(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);
     layout_size = reader.GetPosition();
     util::Log(logDEBUG) << "Data layout has size " << layout_size;

src/osrm/osrm.cpp

@@ -32,12 +32,6 @@ OSRM::OSRM(engine::EngineConfig &config)
         storage::SharedMonitor<storage::SharedDataTimestamp> barrier;
         using mutex_type = typename decltype(barrier)::mutex_type;
         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

src/storage/storage.cpp

@@ -165,6 +165,7 @@ int Storage::Run(int max_wait)
 
     // Allocate shared memory block
     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";
     auto data_memory = makeSharedMemory(next_region, regions_size);