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

collapse if statement in datastore

Browse Source
This commit is contained in:
Dennis Luxen 2014-07-02 11:18:45 +02:00
parent 3568dc2083
commit 36c0edea2a
1 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
datastore.cpp
View File

@ -63,33 +63,30 @@ typedef StaticGraph<QueryEdge::EdgeData> QueryGraph;
// delete a shared memory region. report warning if it could not be deleted
void delete_region(const SharedDataType region)
{
if (SharedMemory::RegionExists(region))
if (SharedMemory::RegionExists(region) && !SharedMemory::Remove(region))
{
if (!SharedMemory::Remove(region))
const std::string name = [&]
{
const std::string name = [&]
switch (region)
{
switch (region)
{
case CURRENT_REGIONS:
return "CURRENT_REGIONS";
case LAYOUT_1:
return "LAYOUT_1";
case DATA_1:
return "DATA_1";
case LAYOUT_2:
return "LAYOUT_2";
case DATA_2:
return "DATA_2";
case LAYOUT_NONE:
return "LAYOUT_NONE";
default: // DATA_NONE:
return "DATA_NONE";
}
}();
case CURRENT_REGIONS:
return "CURRENT_REGIONS";
case LAYOUT_1:
return "LAYOUT_1";
case DATA_1:
return "DATA_1";
case LAYOUT_2:
return "LAYOUT_2";
case DATA_2:
return "DATA_2";
case LAYOUT_NONE:
return "LAYOUT_NONE";
default: // DATA_NONE:
return "DATA_NONE";
}
}();
SimpleLogger().Write(logWARNING) << "could not delete shared memory region " << name;
}
SimpleLogger().Write(logWARNING) << "could not delete shared memory region " << name;
}
}