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

use only one pointer for shared layout

Browse Source
This commit is contained in:
Dennis Luxen 2013-09-30 11:28:53 +02:00
parent 4852802d66
commit 7dd711b37c
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
datastore.cpp
View File

@ -102,6 +102,7 @@ int main(int argc, char * argv[]) {
SharedDataLayout * shared_layout_ptr = static_cast<SharedDataLayout *>( SharedDataLayout * shared_layout_ptr = static_cast<SharedDataLayout *>(
layout_memory->Ptr() layout_memory->Ptr()
); );
shared_layout_ptr = new SharedDataLayout();
// // // //
// collect number of elements to store in shared memory object // // collect number of elements to store in shared memory object //
@ -114,11 +115,13 @@ int main(int argc, char * argv[]) {
unsigned name_index_size = 0; unsigned name_index_size = 0;
name_stream.read((char *)&name_index_size, sizeof(unsigned)); name_stream.read((char *)&name_index_size, sizeof(unsigned));
shared_layout_ptr->name_index_list_size = name_index_size; shared_layout_ptr->name_index_list_size = name_index_size;
SimpleLogger().Write() << "name index size: " << shared_layout_ptr->name_index_list_size;
BOOST_ASSERT_MSG(0 != shared_layout_ptr->name_index_list_size, "name file broken"); BOOST_ASSERT_MSG(0 != shared_layout_ptr->name_index_list_size, "name file broken");
unsigned number_of_chars = 0; unsigned number_of_chars = 0;
name_stream.read((char *)&number_of_chars, sizeof(unsigned)); name_stream.read((char *)&number_of_chars, sizeof(unsigned));
shared_layout_ptr->name_char_list_size = number_of_chars; shared_layout_ptr->name_char_list_size = number_of_chars;
SimpleLogger().Write() << "name char size: " << shared_layout_ptr->name_char_list_size;
//Loading information for original edges //Loading information for original edges
boost::filesystem::ifstream edges_input_stream( boost::filesystem::ifstream edges_input_stream(
@ -308,7 +311,6 @@ int main(int argc, char * argv[]) {
shared_layout_ptr->graph_node_list_size*sizeof(QueryGraph::_StrNode) shared_layout_ptr->graph_node_list_size*sizeof(QueryGraph::_StrNode)
); );
// 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->GetGraphEdgeListOffsett()