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

fix unpacking of geometry for shared memory

Browse Source
This commit is contained in:
Dennis Luxen 2014-04-22 16:15:59 +02:00
parent 5da01946b8
commit ca016e2818
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
datastore.cpp
View File

@ -48,6 +48,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/integer.hpp> #include <boost/integer.hpp>
#include <boost/iostreams/seek.hpp> #include <boost/iostreams/seek.hpp>
#include <fstream>
#include <string> #include <string>
#include <vector> #include <vector>
@ -168,7 +169,6 @@ int main( const int argc, const char * argv[] ) {
shared_layout_ptr->ram_index_file_name[end_of_string_index] = '\0'; shared_layout_ptr->ram_index_file_name[end_of_string_index] = '\0';
// collect number of elements to store in shared memory object // collect number of elements to store in shared memory object
SimpleLogger().Write(logDEBUG) << "Collecting files sizes";
SimpleLogger().Write() << "load names from: " << names_data_path; SimpleLogger().Write() << "load names from: " << names_data_path;
// number of entries in name index // number of entries in name index
boost::filesystem::ifstream name_stream( boost::filesystem::ifstream name_stream(
@ -197,7 +197,7 @@ int main( const int argc, const char * argv[] ) {
shared_layout_ptr->via_node_list_size = number_of_original_edges; shared_layout_ptr->via_node_list_size = number_of_original_edges;
shared_layout_ptr->name_id_list_size = number_of_original_edges; shared_layout_ptr->name_id_list_size = number_of_original_edges;
shared_layout_ptr->turn_instruction_list_size = number_of_original_edges; shared_layout_ptr->turn_instruction_list_size = number_of_original_edges;
shared_layout_ptr->geometries_compression = number_of_original_edges; shared_layout_ptr->geometries_indicators = number_of_original_edges;
boost::filesystem::ifstream hsgr_input_stream( boost::filesystem::ifstream hsgr_input_stream(
hsgr_path, hsgr_path,
@ -283,8 +283,8 @@ int main( const int argc, const char * argv[] ) {
// load geometries sizes // load geometries sizes
boost::filesystem::ifstream geometry_input_stream( std::ifstream geometry_input_stream(
geometries_data_path, geometries_data_path.c_str(),
std::ios::binary std::ios::binary
); );
unsigned number_of_geometries_indices = 0; unsigned number_of_geometries_indices = 0;
@ -296,10 +296,7 @@ int main( const int argc, const char * argv[] ) {
geometry_input_stream.read( (char *)&number_of_compressed_geometries, sizeof(unsigned)); geometry_input_stream.read( (char *)&number_of_compressed_geometries, sizeof(unsigned));
shared_layout_ptr->geometries_list_size = number_of_compressed_geometries; shared_layout_ptr->geometries_list_size = number_of_compressed_geometries;
SimpleLogger().Write(logDEBUG) << "number_of_geometries_indices : " << number_of_geometries_indices << ", number_of_compressed_geometries: " << number_of_compressed_geometries;
// allocate shared memory block // allocate shared memory block
SimpleLogger().Write() << "allocating shared memory of " << shared_layout_ptr->GetSizeOfLayout() << " bytes"; SimpleLogger().Write() << "allocating shared memory of " << shared_layout_ptr->GetSizeOfLayout() << " bytes";
SharedMemory * shared_memory = SharedMemoryFactory::Get( SharedMemory * shared_memory = SharedMemoryFactory::Get(
DATA, DATA,
@ -356,17 +353,22 @@ int main( const int argc, const char * argv[] ) {
const unsigned bucket = i / 32; const unsigned bucket = i / 32;
const unsigned offset = i % 32; const unsigned offset = i % 32;
unsigned value = ((0 == offset) ? 0 : geometries_indicator_ptr[bucket]); unsigned value = ((0 == offset) ? 0 : geometries_indicator_ptr[bucket]);
if (current_edge_data.compressed_geometry)
{
geometries_indicator_ptr[bucket] = (value | (1 << offset)); geometries_indicator_ptr[bucket] = (value | (1 << offset));
}
} }
edges_input_stream.close(); edges_input_stream.close();
//TODO: load compressed geometry // load compressed geometry
unsigned temporary_value;
unsigned * geometries_index_ptr = (unsigned *)( unsigned * geometries_index_ptr = (unsigned *)(
shared_memory_ptr + shared_layout_ptr->GetGeometriesIndexListOffset() shared_memory_ptr + shared_layout_ptr->GetGeometriesIndexListOffset()
); );
boost::iostreams::seek(geometry_input_stream, sizeof(unsigned), BOOST_IOS::beg); geometry_input_stream.seekg(0, geometry_input_stream.beg);
geometry_input_stream.read((char *)&temporary_value, sizeof(unsigned));
BOOST_ASSERT(temporary_value == shared_layout_ptr->geometries_index_list_size);
geometry_input_stream.read( geometry_input_stream.read(
(char *)geometries_index_ptr, (char *)geometries_index_ptr,
shared_layout_ptr->geometries_index_list_size*sizeof(unsigned) shared_layout_ptr->geometries_index_list_size*sizeof(unsigned)
@ -375,7 +377,10 @@ int main( const int argc, const char * argv[] ) {
unsigned * geometries_list_ptr = (unsigned *)( unsigned * geometries_list_ptr = (unsigned *)(
shared_memory_ptr + shared_layout_ptr->GetGeometryListOffset() shared_memory_ptr + shared_layout_ptr->GetGeometryListOffset()
); );
boost::iostreams::seek(geometry_input_stream, sizeof(unsigned), BOOST_IOS::cur);
geometry_input_stream.read((char *)&temporary_value, sizeof(unsigned));
BOOST_ASSERT(temporary_value == shared_layout_ptr->geometries_list_size);
geometry_input_stream.read( geometry_input_stream.read(
(char *)geometries_list_ptr, (char *)geometries_list_ptr,
shared_layout_ptr->geometries_list_size*sizeof(unsigned) shared_layout_ptr->geometries_list_size*sizeof(unsigned)
@ -422,7 +427,7 @@ int main( const int argc, const char * argv[] ) {
// load the edges of the search graph // load the edges of the search graph
QueryGraph::_StrEdge * graph_edge_list_ptr = (QueryGraph::_StrEdge *)( QueryGraph::_StrEdge * graph_edge_list_ptr = (QueryGraph::_StrEdge *)(
shared_memory_ptr + shared_layout_ptr->GetGraphEdgeListOffsett() shared_memory_ptr + shared_layout_ptr->GetGraphEdgeListOffset()
); );
hsgr_input_stream.read( hsgr_input_stream.read(
(char*) graph_edge_list_ptr, (char*) graph_edge_list_ptr,
@ -473,6 +478,8 @@ int main( const int argc, const char * argv[] ) {
} }
} }
SimpleLogger().Write() << "all data loaded"; SimpleLogger().Write() << "all data loaded";
shared_layout_ptr->PrintInformation();
} catch(const std::exception & e) { } catch(const std::exception & e) {
SimpleLogger().Write(logWARNING) << "caught exception: " << e.what(); SimpleLogger().Write(logWARNING) << "caught exception: " << e.what();
} }