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

load correct segment, remove some debug output

Browse Source
This commit is contained in:
Dennis Luxen 2013-10-25 22:26:27 +02:00
parent 3e5e3175e0
commit 62c2c750ea
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Server/DataStructures/SharedDataFacade.h
View File

@ -215,7 +215,7 @@ public:
CURRENT_DATA = data_type_ptr[1]; CURRENT_DATA = data_type_ptr[1];
data_layout = (SharedDataLayout *)( data_layout = (SharedDataLayout *)(
SharedMemoryFactory::Get(LAYOUT_1)->Ptr() SharedMemoryFactory::Get(CURRENT_LAYOUT)->Ptr()
); );
boost::filesystem::path ram_index_path(data_layout->ram_index_file_name); boost::filesystem::path ram_index_path(data_layout->ram_index_file_name);
if( !boost::filesystem::exists(ram_index_path) ) { if( !boost::filesystem::exists(ram_index_path) ) {
@ -224,22 +224,16 @@ public:
SimpleLogger().Write() << "0"; SimpleLogger().Write() << "0";
shared_memory = (char *)( shared_memory = (char *)(
SharedMemoryFactory::Get(DATA_1)->Ptr() SharedMemoryFactory::Get(CURRENT_DATA)->Ptr()
); );
SimpleLogger().Write(logDEBUG) << "(re-)loading data from shared memory"; SimpleLogger().Write(logDEBUG) << "(re-)loading data from shared memory";
LoadGraph(); LoadGraph();
SimpleLogger().Write() << "1";
LoadNodeAndEdgeInformation(); LoadNodeAndEdgeInformation();
SimpleLogger().Write() << "2";
LoadRTree(ram_index_path); LoadRTree(ram_index_path);
SimpleLogger().Write() << "3";
LoadTimestamp(); LoadTimestamp();
SimpleLogger().Write() << "4";
LoadViaNodeList(); LoadViaNodeList();
SimpleLogger().Write() << "5";
LoadNames(); LoadNames();
SimpleLogger().Write() << "6";
} else { } else {
SimpleLogger().Write(logDEBUG) << "using previously loaded data"; SimpleLogger().Write(logDEBUG) << "using previously loaded data";
} }