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

refactor loading code of .ramIndex files and move to io.hpp

Browse Source
This commit is contained in:
Huyen Chau Nguyen 2016-10-21 11:25:38 -07:00
parent 69a60686dc
commit fe94977c9b
3 changed files with 38 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
include/storage/io.hpp
View File

@ -1,6 +1,8 @@
#ifndef OSRM_STORAGE_IO_HPP_
#define OSRM_STORAGE_IO_HPP_
#include "extractor/original_edge_data.hpp"
#include "extractor/query_node.hpp"
#include "util/fingerprint.hpp"
#include "util/simple_logger.hpp"
@ -68,6 +70,8 @@ void readHSGR(boost::filesystem::ifstream &input_stream,
EdgeT edge_buffer[],
std::uint32_t number_of_edges)
{
BOOST_ASSERT(node_buffer);
BOOST_ASSERT(edge_buffer);
input_stream.read(reinterpret_cast<char *>(node_buffer), number_of_nodes * sizeof(NodeT));
input_stream.read(reinterpret_cast<char *>(edge_buffer), number_of_edges * sizeof(EdgeT));
}
@ -85,6 +89,7 @@ inline void readTimestamp(boost::filesystem::ifstream &timestamp_input_stream,
char timestamp[],
std::size_t timestamp_length)
{
BOOST_ASSERT(timestamp);
timestamp_input_stream.read(timestamp, timestamp_length * sizeof(char));
}
@ -118,6 +123,12 @@ void readEdgesData(boost::filesystem::ifstream &edges_input_stream,
PostTurnBearingT post_turn_bearing_list[],
std::uint32_t number_of_edges)
{
BOOST_ASSERT(geometry_list);
BOOST_ASSERT(name_id_list);
BOOST_ASSERT(turn_instruction_list);
BOOST_ASSERT(lane_data_id_list);
BOOST_ASSERT(travel_mode_list);
BOOST_ASSERT(entry_class_id_list);
extractor::OriginalEdgeData current_edge_data;
for (std::uint32_t i = 0; i < number_of_edges; ++i)
{
@ -149,6 +160,7 @@ void readNodesData(boost::filesystem::ifstream &nodes_input_stream,
OSMNodeIDVectorT &osmnodeid_list,
std::uint32_t number_of_coordinates)
{
BOOST_ASSERT(coordinate_list);
extractor::QueryNode current_node;
for (std::uint32_t i = 0; i < number_of_coordinates; ++i)
{
@ -160,8 +172,6 @@ void readNodesData(boost::filesystem::ifstream &nodes_input_stream,
}
// Returns the number of indexes in a .datasource_indexes file
// TODO: The original code used uint_64t to store the number of indexes. Can someone confirm that
// this makes sense?
inline std::uint64_t
readDatasourceIndexesSize(boost::filesystem::ifstream &datasource_indexes_input_stream)
{
@ -177,6 +187,7 @@ inline void readDatasourceIndexes(boost::filesystem::ifstream &datasource_indexe
uint8_t datasource_buffer[],
std::uint32_t number_of_datasource_indexes)
{
BOOST_ASSERT(datasource_buffer);
datasource_indexes_input_stream.read(reinterpret_cast<char *>(datasource_buffer),
number_of_datasource_indexes * sizeof(std::uint8_t));
}
@ -207,6 +218,24 @@ readDatasourceNamesData(boost::filesystem::ifstream &datasource_names_input_stre
}
return datasource_names_data;
}
// Returns the number of ram indexes
inline std::uint32_t readRamIndexSize(boost::filesystem::ifstream &ram_index_input_stream)
{
std::uint32_t tree_size = 0;
ram_index_input_stream.read((char *)&tree_size, sizeof(std::uint32_t));
return tree_size;
}
template <typename RTreeNodeT>
void readRamIndexData(boost::filesystem::ifstream &ram_index_input_stream,
RTreeNodeT rtree_buffer[],
std::uint32_t tree_size)
{
BOOST_ASSERT(rtree_buffer);
ram_index_input_stream.read(reinterpret_cast<char *>(rtree_buffer), sizeof(RTreeNodeT) * tree_size);
}
}
}
}

10
include/util/static_rtree.hpp
View File

@ -1,6 +1,7 @@
#ifndef STATIC_RTREE_HPP
#define STATIC_RTREE_HPP
#include "storage/io.hpp"
#include "util/bearing.hpp"
#include "util/coordinate_calculation.hpp"
#include "util/deallocating_vector.hpp"
@ -356,14 +357,11 @@ class StaticRTree
}
boost::filesystem::ifstream tree_node_file(node_file, std::ios::binary);
std::uint32_t tree_size = 0;
tree_node_file.read((char *)&tree_size, sizeof(std::uint32_t));
std::uint32_t tree_size = storage::io::readRamIndexSize(tree_node_file);
m_search_tree.resize(tree_size);
if (tree_size > 0)
{
tree_node_file.read((char *)&m_search_tree[0], sizeof(TreeNode) * tree_size);
}
storage::io::readRamIndexData(tree_node_file, &m_search_tree[0], tree_size);
MapLeafNodesFile(leaf_file);
}

13
src/storage/storage.cpp
View File

@ -266,8 +266,7 @@ Storage::ReturnCode Storage::Run(int max_wait)
// load rsearch tree size
boost::filesystem::ifstream tree_node_file(config.ram_index_path, std::ios::binary);
uint32_t tree_size = 0;
tree_node_file.read((char *)&tree_size, sizeof(uint32_t));
std::uint32_t tree_size = io::readRamIndexSize(tree_node_file);
shared_layout_ptr->SetBlockSize<RTreeNode>(SharedDataLayout::R_SEARCH_TREE, tree_size);
// allocate space in shared memory for profile properties
@ -677,7 +676,6 @@ Storage::ReturnCode Storage::Run(int max_wait)
util::PackedVector<OSMNodeID, true> osmnodeid_list;
osmnodeid_list.reset(osmnodeid_ptr,
shared_layout_ptr->num_entries[SharedDataLayout::OSM_NODE_ID_LIST]);
io::readNodesData(nodes_input_stream, coordinates_ptr, osmnodeid_list, coordinate_list_size);
nodes_input_stream.close();
@ -687,14 +685,9 @@ Storage::ReturnCode Storage::Run(int max_wait)
io::readTimestamp(timestamp_stream, timestamp_ptr, timestamp_size);
// store search tree portion of rtree
char *rtree_ptr = shared_layout_ptr->GetBlockPtr<char, true>(shared_memory_ptr,
RTreeNode *rtree_ptrtest = shared_layout_ptr->GetBlockPtr<RTreeNode, true>(shared_memory_ptr,
SharedDataLayout::R_SEARCH_TREE);
if (tree_size > 0)
{
tree_node_file.read(rtree_ptr, sizeof(RTreeNode) * tree_size);
}
tree_node_file.close();
io::readRamIndexData(tree_node_file, rtree_ptrtest, tree_size);
// load core markers
std::vector<char> unpacked_core_markers(number_of_core_markers);