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

Use read-only mmap as member in StaticRTree

Browse Source
This commit is contained in:
Patrick Niklaus 2018-03-27 10:20:06 +00:00
parent e572d6c340
commit 4ef331db1f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/util/static_rtree.hpp
View File

@ -259,9 +259,9 @@ class StaticRTree
// Holds the start indexes of each level in m_search_tree // Holds the start indexes of each level in m_search_tree
Vector<std::uint64_t> m_tree_level_starts; Vector<std::uint64_t> m_tree_level_starts;
// mmap'd .fileIndex file // mmap'd .fileIndex file
boost::iostreams::mapped_file m_objects_region; boost::iostreams::mapped_file_source m_objects_region;
// This is a view of the EdgeDataT data mmap'd from the .fileIndex file // This is a view of the EdgeDataT data mmap'd from the .fileIndex file
util::vector_view<EdgeDataT> m_objects; util::vector_view<const EdgeDataT> m_objects;
public: public:
StaticRTree(const StaticRTree &) = delete; StaticRTree(const StaticRTree &) = delete;
@ -273,9 +273,7 @@ class StaticRTree
explicit StaticRTree(const std::vector<EdgeDataT> &input_data_vector, explicit StaticRTree(const std::vector<EdgeDataT> &input_data_vector,
const Vector<Coordinate> &coordinate_list, const Vector<Coordinate> &coordinate_list,
const boost::filesystem::path &on_disk_file_name) const boost::filesystem::path &on_disk_file_name)
: m_coordinate_list(coordinate_list), : m_coordinate_list(coordinate_list)
m_objects{mmapFile<EdgeDataT>(
on_disk_file_name, m_objects_region, input_data_vector.size() * sizeof(EdgeDataT))}
{ {
const auto element_count = input_data_vector.size(); const auto element_count = input_data_vector.size();
std::vector<WrappedInputElement> input_wrapper_vector(element_count); std::vector<WrappedInputElement> input_wrapper_vector(element_count);
@ -311,6 +309,10 @@ class StaticRTree
// sort the hilbert-value representatives // sort the hilbert-value representatives
tbb::parallel_sort(input_wrapper_vector.begin(), input_wrapper_vector.end()); tbb::parallel_sort(input_wrapper_vector.begin(), input_wrapper_vector.end());
{ {
boost::iostreams::mapped_file out_objects_region;
auto out_objects = mmapFile<EdgeDataT>(on_disk_file_name,
out_objects_region,
input_data_vector.size() * sizeof(EdgeDataT));
// Note, we can't just write everything in one go, because the input_data_vector // Note, we can't just write everything in one go, because the input_data_vector
// is not sorted by hilbert code, only the input_wrapper_vector is in the correct // is not sorted by hilbert code, only the input_wrapper_vector is in the correct
@ -321,7 +323,7 @@ class StaticRTree
// Create the first level of TreeNodes - each bounding LEAF_NODE_COUNT EdgeDataT // Create the first level of TreeNodes - each bounding LEAF_NODE_COUNT EdgeDataT
// objects. // objects.
std::size_t wrapped_element_index = 0; std::size_t wrapped_element_index = 0;
auto objects_iter = m_objects.begin(); auto objects_iter = out_objects.begin();
while (wrapped_element_index < element_count) while (wrapped_element_index < element_count)
{ {
@ -368,6 +370,8 @@ class StaticRTree
m_search_tree.emplace_back(current_node); m_search_tree.emplace_back(current_node);
} }
} }
// mmap as read-only now
m_objects = mmapFile<EdgeDataT>(on_disk_file_name, m_objects_region);
// Should hold the number of nodes at the lowest level of the graph (closest // Should hold the number of nodes at the lowest level of the graph (closest
// to the data) // to the data)