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

Fix removing shared memory segments in a multi-process setup

Browse Source
This commit is contained in:
Patrick Niklaus 2016-12-09 00:13:47 +00:00 committed by Patrick Niklaus
parent cbfb055f81
commit 03d653c0bb
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/engine/datafacade/shared_memory_datafacade.hpp
View File

@ -46,6 +46,10 @@ class SharedMemoryDataFacade : public ContiguousInternalMemoryDataFacadeBase
// if this returns false this is still in use // if this returns false this is still in use
if (exclusive_lock.try_lock()) if (exclusive_lock.try_lock())
{ {
if (storage::SharedMemory::RegionExists(data_region))
{
BOOST_ASSERT(storage::SharedMemory::RegionExists(layout_region));
// Now check if this is still the newest dataset // Now check if this is still the newest dataset
const boost::interprocess::sharable_lock<boost::interprocess::named_upgradable_mutex> const boost::interprocess::sharable_lock<boost::interprocess::named_upgradable_mutex>
lock(shared_barriers->current_regions_mutex); lock(shared_barriers->current_regions_mutex);
@ -65,6 +69,7 @@ class SharedMemoryDataFacade : public ContiguousInternalMemoryDataFacadeBase
} }
} }
} }
}
SharedMemoryDataFacade(const std::shared_ptr<storage::SharedBarriers> &shared_barriers_, SharedMemoryDataFacade(const std::shared_ptr<storage::SharedBarriers> &shared_barriers_,
storage::SharedDataType layout_region_, storage::SharedDataType layout_region_,