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

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

@ -46,22 +46,27 @@ 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())
{ {
// Now check if this is still the newest dataset if (storage::SharedMemory::RegionExists(data_region))
const boost::interprocess::sharable_lock<boost::interprocess::named_upgradable_mutex>
lock(shared_barriers->current_regions_mutex);
auto shared_regions = storage::makeSharedMemory(storage::CURRENT_REGIONS);
const auto current_timestamp =
static_cast<const storage::SharedDataTimestamp *>(shared_regions->Ptr());
if (current_timestamp->timestamp == shared_timestamp)
{ {
util::Log(logDEBUG) << "Retaining data with shared timestamp " << shared_timestamp; BOOST_ASSERT(storage::SharedMemory::RegionExists(layout_region));
}
else // Now check if this is still the newest dataset
{ const boost::interprocess::sharable_lock<boost::interprocess::named_upgradable_mutex>
storage::SharedMemory::Remove(data_region); lock(shared_barriers->current_regions_mutex);
storage::SharedMemory::Remove(layout_region);
auto shared_regions = storage::makeSharedMemory(storage::CURRENT_REGIONS);
const auto current_timestamp =
static_cast<const storage::SharedDataTimestamp *>(shared_regions->Ptr());
if (current_timestamp->timestamp == shared_timestamp)
{
util::Log(logDEBUG) << "Retaining data with shared timestamp " << shared_timestamp;
}
else
{
storage::SharedMemory::Remove(data_region);
storage::SharedMemory::Remove(layout_region);
}
} }
} }
} }