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

mild refactoring of debug outputs

Browse Source
This commit is contained in:
Dennis Luxen 2013-10-01 18:01:19 +02:00
parent 940b740b24
commit 0f58ff8356
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
datastore.cpp
View File

@ -148,16 +148,17 @@ int main(int argc, char * argv[]) {
); );
unsigned number_of_original_edges = 0; unsigned number_of_original_edges = 0;
edges_input_stream.read((char*)&number_of_original_edges, sizeof(unsigned)); edges_input_stream.read((char*)&number_of_original_edges, sizeof(unsigned));
SimpleLogger().Write() << "number of edges: " << number_of_original_edges; SimpleLogger().Write(logDEBUG) <<
"number of edges: " << number_of_original_edges;
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;
SimpleLogger().Write() << "noted number of edges"; SimpleLogger().Write(logDEBUG) << "noted number of edges";
SimpleLogger().Write() << "loading hsgr from " << hsgr_path.string(); SimpleLogger().Write(logDEBUG) << "loading hsgr from " << hsgr_path.string();
boost::filesystem::ifstream hsgr_input_stream( boost::filesystem::ifstream hsgr_input_stream(
hsgr_path, hsgr_path,
std::ios::binary std::ios::binary
@ -173,20 +174,19 @@ int main(int argc, char * argv[]) {
SimpleLogger().Write() << "UUID checked out ok"; SimpleLogger().Write() << "UUID checked out ok";
} }
SimpleLogger().Write() << "loaded file";
// load checksum // load checksum
unsigned checksum = 0; unsigned checksum = 0;
hsgr_input_stream.read((char*)&checksum, sizeof(unsigned) ); hsgr_input_stream.read((char*)&checksum, sizeof(unsigned) );
SimpleLogger().Write() << "checksum: " << checksum; SimpleLogger().Write() << "checksum: " << checksum;
shared_layout_ptr->checksum = checksum; shared_layout_ptr->checksum = checksum;
SimpleLogger().Write() << "noted checksum"; SimpleLogger().Write(logDEBUG) << "noted checksum";
// load graph node size // load graph node size
unsigned number_of_graph_nodes = 0; unsigned number_of_graph_nodes = 0;
hsgr_input_stream.read( hsgr_input_stream.read(
(char*) &number_of_graph_nodes, (char*) &number_of_graph_nodes,
sizeof(unsigned) sizeof(unsigned)
); );
SimpleLogger().Write() << "number of nodes: " << number_of_graph_nodes; SimpleLogger().Write(logDEBUG) << "number of nodes: " << number_of_graph_nodes;
BOOST_ASSERT_MSG( BOOST_ASSERT_MSG(
(0 != number_of_graph_nodes), (0 != number_of_graph_nodes),
"number of nodes is zero" "number of nodes is zero"
@ -201,7 +201,7 @@ int main(int argc, char * argv[]) {
shared_layout_ptr->graph_edge_list_size = number_of_graph_edges; shared_layout_ptr->graph_edge_list_size = number_of_graph_edges;
// load rsearch tree size // load rsearch tree size
SimpleLogger().Write() << "loading r-tree search list size"; SimpleLogger().Write(logDEBUG) << "loading r-tree search list size";
boost::filesystem::ifstream tree_node_file( boost::filesystem::ifstream tree_node_file(
ram_index_path, ram_index_path,
std::ios::binary std::ios::binary
@ -212,7 +212,7 @@ int main(int argc, char * argv[]) {
shared_layout_ptr->r_search_tree_size = tree_size; shared_layout_ptr->r_search_tree_size = tree_size;
//load timestamp size //load timestamp size
SimpleLogger().Write() << "Loading timestamp"; SimpleLogger().Write(logDEBUG) << "Loading timestamp";
std::string m_timestamp; std::string m_timestamp;
if( boost::filesystem::exists(timestamp_path) ) { if( boost::filesystem::exists(timestamp_path) ) {
boost::filesystem::ifstream timestampInStream( timestamp_path ); boost::filesystem::ifstream timestampInStream( timestamp_path );
@ -231,7 +231,8 @@ int main(int argc, char * argv[]) {
shared_layout_ptr->timestamp_length = m_timestamp.length(); shared_layout_ptr->timestamp_length = m_timestamp.length();
//load coordinate size //load coordinate size
SimpleLogger().Write(logDEBUG) << "Loading coordinates list"; SimpleLogger().Write() <<
"Loading coordinates list from " << node_data_path.string();
boost::filesystem::ifstream nodes_input_stream( boost::filesystem::ifstream nodes_input_stream(
node_data_path, node_data_path,
std::ios::binary std::ios::binary
@ -262,7 +263,7 @@ int main(int argc, char * argv[]) {
shared_layout_ptr->name_index_list_size*sizeof(unsigned) shared_layout_ptr->name_index_list_size*sizeof(unsigned)
); );
SimpleLogger().Write() << "Loading names char list"; SimpleLogger().Write(logDEBUG) << "Loading names char list";
SimpleLogger().Write(logDEBUG) << "Bytes: " << shared_layout_ptr->name_char_list_size*sizeof(char); SimpleLogger().Write(logDEBUG) << "Bytes: " << shared_layout_ptr->name_char_list_size*sizeof(char);
char * name_char_ptr = shared_memory_ptr + shared_layout_ptr->GetNameListOffset(); char * name_char_ptr = shared_memory_ptr + shared_layout_ptr->GetNameListOffset();
name_stream.read( name_stream.read(
@ -272,7 +273,9 @@ int main(int argc, char * argv[]) {
name_stream.close(); name_stream.close();
//load original edge information //load original edge information
SimpleLogger().Write() << "Loading via node, coordinates and turn instruction list"; SimpleLogger().Write() <<
"Loading via node, coordinates and turn instruction lists from: " <<
edge_data_path.string();
NodeID * via_node_ptr = (NodeID *)( NodeID * via_node_ptr = (NodeID *)(
shared_memory_ptr + shared_layout_ptr->GetViaNodeListOffset() shared_memory_ptr + shared_layout_ptr->GetViaNodeListOffset()
@ -348,10 +351,12 @@ int main(int argc, char * argv[]) {
); );
hsgr_input_stream.close(); hsgr_input_stream.close();
SimpleLogger().Write() << "all data loaded. pressing a key deallocates memory";
std::cin.get();
} catch(const std::exception & e) { } catch(const std::exception & e) {
SimpleLogger().Write(logWARNING) << "caught exception: " << e.what(); SimpleLogger().Write(logWARNING) << "caught exception: " << e.what();
} }
SimpleLogger().Write() << "all done. pressing a key deallocates memory";
std::cin.get();
return 0; return 0;
} }