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

Restore use of user-provided osmium:🧵:Pool instance

Browse Source 
Pool instance has been removed from Reader ctor parameters
list in PR #4438, presumably unintentionally.
It is required to prevent potential deadlock during
Pool shutdown as explained in PR #4452.
This commit is contained in:
Mateusz Loskot 2018-01-05 15:57:38 +01:00 committed by Michael Krasnyk
parent 6d801e7086
commit 5b2af6ef09
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/extractor/extractor.cpp
View File

@ -365,7 +365,7 @@ Extractor::ParseOSMData(ScriptingEnvironment &scripting_environment,
TIMER_START(parsing); TIMER_START(parsing);
{ // Parse OSM header { // Parse OSM header
osmium::io::Reader reader(input_file, osmium::osm_entity_bits::nothing); osmium::io::Reader reader(input_file, pool, osmium::osm_entity_bits::nothing);
osmium::io::Header header = reader.header(); osmium::io::Header header = reader.header();
std::string generator = header.get("generator"); std::string generator = header.get("generator");
@ -545,7 +545,7 @@ Extractor::ParseOSMData(ScriptingEnvironment &scripting_environment,
{ // Relations reading pipeline { // Relations reading pipeline
util::Log() << "Parse relations ..."; util::Log() << "Parse relations ...";
osmium::io::Reader reader(input_file, osmium::osm_entity_bits::relation, read_meta); osmium::io::Reader reader(input_file, pool, osmium::osm_entity_bits::relation, read_meta);
tbb::parallel_pipeline( tbb::parallel_pipeline(
num_threads, buffer_reader(reader) & buffer_relation_cache & buffer_storage_relation); num_threads, buffer_reader(reader) & buffer_relation_cache & buffer_storage_relation);
} }
@ -553,6 +553,7 @@ Extractor::ParseOSMData(ScriptingEnvironment &scripting_environment,
{ // Nodes and ways reading pipeline { // Nodes and ways reading pipeline
util::Log() << "Parse ways and nodes ..."; util::Log() << "Parse ways and nodes ...";
osmium::io::Reader reader(input_file, osmium::io::Reader reader(input_file,
pool,
osmium::osm_entity_bits::node | osmium::osm_entity_bits::way | osmium::osm_entity_bits::node | osmium::osm_entity_bits::way |
osmium::osm_entity_bits::relation, osmium::osm_entity_bits::relation,
read_meta); read_meta);