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

Expose concurrency between intern/external node map and geometries

Browse Source
This commit is contained in:
Daniel J. Hofmann 2016-05-16 18:37:46 -04:00 committed by Patrick Niklaus
parent ea38a1d880
commit 2fd1b6c913
No known key found for this signature in database
GPG Key ID: E426891B5F978B1B
1 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/contractor/contractor.cpp
View File

@ -29,7 +29,6 @@
#include <tbb/parallel_sort.h> #include <tbb/parallel_sort.h>
#include <bitset> #include <bitset>
#include <chrono>
#include <cstdint> #include <cstdint>
#include <iterator> #include <iterator>
#include <memory> #include <memory>
@ -267,8 +266,6 @@ std::size_t Contractor::LoadEdgeExpandedGraph(
util::SimpleLogger().Write() << "Reading " << number_of_edges util::SimpleLogger().Write() << "Reading " << number_of_edges
<< " edges from the edge based graph"; << " edges from the edge based graph";
const auto t0 = std::chrono::high_resolution_clock::now();
SegmentSpeedSourceMap segment_speed_lookup; SegmentSpeedSourceMap segment_speed_lookup;
TurnPenaltySourceMap turn_penalty_lookup; TurnPenaltySourceMap turn_penalty_lookup;
@ -290,15 +287,12 @@ std::size_t Contractor::LoadEdgeExpandedGraph(
if (update_edge_weights || update_turn_penalties) if (update_edge_weights || update_turn_penalties)
{ {
const auto t1 = std::chrono::high_resolution_clock::now(); // Here, we have to update the compressed geometry weights
const auto d0 = std::chrono::duration_cast<std::chrono::milliseconds>(t1 - t0).count(); // First, we need the external-to-internal node lookup table
util::SimpleLogger().Write() << ">>> D0: " << d0;
std::vector<extractor::QueryNode> internal_to_external_node_map; std::vector<extractor::QueryNode> internal_to_external_node_map;
// Here, we have to update the compressed geometry weights const auto load_internal_to_external_node_map = [&] {
// First, we need the external-to-internal node lookup table
{
boost::filesystem::ifstream nodes_input_stream(nodes_filename, std::ios::binary); boost::filesystem::ifstream nodes_input_stream(nodes_filename, std::ios::binary);
if (!nodes_input_stream) if (!nodes_input_stream)
@ -313,16 +307,12 @@ std::size_t Contractor::LoadEdgeExpandedGraph(
// Load all the query nodes into a vector // Load all the query nodes into a vector
nodes_input_stream.read(reinterpret_cast<char *>(&(internal_to_external_node_map[0])), nodes_input_stream.read(reinterpret_cast<char *>(&(internal_to_external_node_map[0])),
number_of_nodes * sizeof(extractor::QueryNode)); number_of_nodes * sizeof(extractor::QueryNode));
} };
const auto t2 = std::chrono::high_resolution_clock::now();
const auto d1 = std::chrono::duration_cast<std::chrono::milliseconds>(t2 - t1).count();
util::SimpleLogger().Write() << ">>> D1: " << d1;
std::vector<unsigned> m_geometry_indices; std::vector<unsigned> m_geometry_indices;
std::vector<extractor::CompressedEdgeContainer::CompressedEdge> m_geometry_list; std::vector<extractor::CompressedEdgeContainer::CompressedEdge> m_geometry_list;
{ const auto load_geometries = [&] {
std::ifstream geometry_stream(geometry_filename, std::ios::binary); std::ifstream geometry_stream(geometry_filename, std::ios::binary);
if (!geometry_stream) if (!geometry_stream)
{ {
@ -352,11 +342,9 @@ std::size_t Contractor::LoadEdgeExpandedGraph(
number_of_compressed_geometries * number_of_compressed_geometries *
sizeof(extractor::CompressedEdgeContainer::CompressedEdge)); sizeof(extractor::CompressedEdgeContainer::CompressedEdge));
} }
} };
const auto t3 = std::chrono::high_resolution_clock::now(); tbb::parallel_invoke(load_internal_to_external_node_map, load_geometries);
const auto d2 = std::chrono::duration_cast<std::chrono::milliseconds>(t3 - t2).count();
util::SimpleLogger().Write() << ">>> D2: " << d2;
// This is a list of the "data source id" for every segment in the compressed // This is a list of the "data source id" for every segment in the compressed
// geometry container. We assume that everything so far has come from the // geometry container. We assume that everything so far has come from the
@ -484,10 +472,6 @@ std::size_t Contractor::LoadEdgeExpandedGraph(
} }
} }
const auto t4 = std::chrono::high_resolution_clock::now();
const auto d3 = std::chrono::duration_cast<std::chrono::milliseconds>(t4 - t3).count();
util::SimpleLogger().Write() << ">>> D3: " << d3;
// Now save out the updated compressed geometries // Now save out the updated compressed geometries
{ {
std::ofstream geometry_stream(geometry_filename, std::ios::binary); std::ofstream geometry_stream(geometry_filename, std::ios::binary);