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

Switch to reliable non-existent handle for QueryHeap items.

Browse Source 
Default-constructed objects of (boost::heap) handle_type are singular,
including the wrapped handle_type::iterator.
Apparently, MSVC iterator debug facilities strictly require that
one singular instance is compared to another singular instance.
It is not possible to get check-comparabe iterators of non-singular
and singular instances as owning container will always mismatch.
This commit is contained in:
Mateusz Loskot 2017-08-11 01:07:29 +02:00 committed by Patrick Niklaus
parent efaed59b9b
commit 2385602500
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
include/util/query_heap.hpp
View File

@ -180,7 +180,16 @@ class QueryHeap
{ {
BOOST_ASSERT(WasInserted(node)); BOOST_ASSERT(WasInserted(node));
const Key index = node_index.peek_index(node); const Key index = node_index.peek_index(node);
return inserted_nodes[index].handle == HeapHandle{};
// Use end iterator as a reliable "non-existent" handle.
// Default-constructed handles are singular and
// can only be checked-compared to another singular instance.
// Behaviour investigated at https://lists.boost.org/boost-users/2017/08/87787.php,
// eventually confirmation at https://stackoverflow.com/a/45622940/151641.
// Corrected in https://github.com/Project-OSRM/osrm-backend/pull/4396
auto const end_it = const_cast<HeapContainer &>(heap).end(); // non-const iterator
auto const none_handle = heap.s_handle_from_iterator(end_it); // from non-const iterator
return inserted_nodes[index].handle == none_handle;
} }
bool WasInserted(const NodeID node) const bool WasInserted(const NodeID node) const
@ -210,14 +219,15 @@ class QueryHeap
BOOST_ASSERT(!heap.empty()); BOOST_ASSERT(!heap.empty());
const Key removedIndex = heap.top().second; const Key removedIndex = heap.top().second;
heap.pop(); heap.pop();
inserted_nodes[removedIndex].handle = HeapHandle{}; inserted_nodes[removedIndex].handle = heap.s_handle_from_iterator(heap.end());
return inserted_nodes[removedIndex].node; return inserted_nodes[removedIndex].node;
} }
void DeleteAll() void DeleteAll()
{ {
std::for_each(inserted_nodes.begin(), inserted_nodes.end(), [](auto &node) { auto const none_handle = heap.s_handle_from_iterator(heap.end());
node.handle = HeapHandle(); std::for_each(inserted_nodes.begin(), inserted_nodes.end(), [&none_handle](auto &node) {
node.handle = none_handle;
}); });
heap.clear(); heap.clear();
} }