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

Make thread-locked access to stxxl containers

Browse Source 
From stxxl FAQ: "you should not share a data structure between
threads (without implementing proper locking yourself)."
The access to name_char_data can be implicitly parallelized
if _GLIBCXX_PARALLEL is defined and invalidate local-thread iterators.
This commit is contained in:
Michael Krasnyk 2016-10-11 23:02:20 +02:00 committed by Daniel J. Hofmann
parent 19eec48207
commit 7753845f5c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/extractor/internal_extractor_edge.hpp
View File

@ -113,7 +113,7 @@ struct InternalExtractorEdge
{ {
return InternalExtractorEdge(MAX_OSM_NODEID, return InternalExtractorEdge(MAX_OSM_NODEID,
MAX_OSM_NODEID, MAX_OSM_NODEID,
0, SPECIAL_NODEID,
WeightData(), WeightData(),
false, false,
false, false,

11
src/extractor/extraction_containers.cpp
View File

@ -20,6 +20,7 @@
#include <chrono> #include <chrono>
#include <limits> #include <limits>
#include <mutex>
namespace namespace
{ {
@ -67,10 +68,13 @@ struct CmpEdgeByInternalSourceTargetAndName
if (lhs.result.source != rhs.result.source) if (lhs.result.source != rhs.result.source)
return lhs.result.source < rhs.result.source; return lhs.result.source < rhs.result.source;
if (lhs.result.source == SPECIAL_NODEID)
return false;
if (lhs.result.target != rhs.result.target) if (lhs.result.target != rhs.result.target)
return lhs.result.target < rhs.result.target; return lhs.result.target < rhs.result.target;
if (lhs.result.source == SPECIAL_NODEID) if (lhs.result.target == SPECIAL_NODEID)
return false; return false;
if (lhs.result.name_id == rhs.result.name_id) if (lhs.result.name_id == rhs.result.name_id)
@ -82,6 +86,7 @@ struct CmpEdgeByInternalSourceTargetAndName
if (rhs.result.name_id == EMPTY_NAMEID) if (rhs.result.name_id == EMPTY_NAMEID)
return true; return true;
std::lock_guard<std::mutex> lock(mutex);
BOOST_ASSERT(!name_offsets.empty() && name_offsets.back() == name_data.size()); BOOST_ASSERT(!name_offsets.empty() && name_offsets.back() == name_data.size());
const oe::ExtractionContainers::STXXLNameCharData::const_iterator data = name_data.begin(); const oe::ExtractionContainers::STXXLNameCharData::const_iterator data = name_data.begin();
return std::lexicographical_compare(data + name_offsets[lhs.result.name_id], return std::lexicographical_compare(data + name_offsets[lhs.result.name_id],
@ -93,6 +98,7 @@ struct CmpEdgeByInternalSourceTargetAndName
value_type max_value() { return value_type::max_internal_value(); } value_type max_value() { return value_type::max_internal_value(); }
value_type min_value() { return value_type::min_internal_value(); } value_type min_value() { return value_type::min_internal_value(); }
std::mutex& mutex;
const oe::ExtractionContainers::STXXLNameCharData &name_data; const oe::ExtractionContainers::STXXLNameCharData &name_data;
const oe::ExtractionContainers::STXXLNameOffsets &name_offsets; const oe::ExtractionContainers::STXXLNameOffsets &name_offsets;
}; };
@ -433,9 +439,10 @@ void ExtractionContainers::PrepareEdges(ScriptingEnvironment &scripting_environm
// Sort edges by start. // Sort edges by start.
std::cout << "[extractor] Sorting edges by renumbered start ... " << std::flush; std::cout << "[extractor] Sorting edges by renumbered start ... " << std::flush;
TIMER_START(sort_edges_by_renumbered_start); TIMER_START(sort_edges_by_renumbered_start);
std::mutex name_data_mutex;
stxxl::sort(all_edges_list.begin(), stxxl::sort(all_edges_list.begin(),
all_edges_list.end(), all_edges_list.end(),
CmpEdgeByInternalSourceTargetAndName{name_char_data, name_offsets}, CmpEdgeByInternalSourceTargetAndName{name_data_mutex, name_char_data, name_offsets},
stxxl_memory); stxxl_memory);
TIMER_STOP(sort_edges_by_renumbered_start); TIMER_STOP(sort_edges_by_renumbered_start);
std::cout << "ok, after " << TIMER_SEC(sort_edges_by_renumbered_start) << "s" << std::endl; std::cout << "ok, after " << TIMER_SEC(sort_edges_by_renumbered_start) << "s" << std::endl;