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

clang-format and remove debug

Browse Source
This commit is contained in:
jakepruitt
2016-10-19 17:11:36 -07:00
committed by Jake Pruitt
parent fa1fc810ea
commit c30784895d
5 changed files with 75 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/storage/storage.cpp
+13 -15
View File
@@ -329,12 +329,12 @@ Storage::ReturnCode Storage::Run(int max_wait)
boost::iostreams::seek(
geometry_input_stream, number_of_geometries_indices * sizeof(unsigned), BOOST_IOS::cur);
geometry_input_stream.read((char *)&number_of_compressed_geometries, sizeof(unsigned));
shared_layout_ptr->SetBlockSize<NodeID>(
SharedDataLayout::GEOMETRIES_NODE_LIST, number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<EdgeWeight>(
SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST, number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<EdgeWeight>(
SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST, number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<NodeID>(SharedDataLayout::GEOMETRIES_NODE_LIST,
number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<EdgeWeight>(SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST,
number_of_compressed_geometries);
shared_layout_ptr->SetBlockSize<EdgeWeight>(SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST,
number_of_compressed_geometries);
// load datasource sizes. This file is optional, and it's non-fatal if it doesn't
// exist.
@@ -605,9 +605,8 @@ Storage::ReturnCode Storage::Run(int max_wait)
(char *)geometries_index_ptr,
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_INDEX));
}
NodeID *geometries_node_id_list_ptr =
shared_layout_ptr->GetBlockPtr<NodeID, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_NODE_LIST);
NodeID *geometries_node_id_list_ptr = shared_layout_ptr->GetBlockPtr<NodeID, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_NODE_LIST);
geometry_input_stream.read((char *)&temporary_value, sizeof(unsigned));
BOOST_ASSERT(temporary_value ==
@@ -619,9 +618,8 @@ Storage::ReturnCode Storage::Run(int max_wait)
(char *)geometries_node_id_list_ptr,
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_NODE_LIST));
}
EdgeWeight *geometries_fwd_weight_list_ptr =
shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST);
EdgeWeight *geometries_fwd_weight_list_ptr = shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST);
BOOST_ASSERT(temporary_value ==
shared_layout_ptr->num_entries[SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST]);
@@ -632,9 +630,8 @@ Storage::ReturnCode Storage::Run(int max_wait)
(char *)geometries_fwd_weight_list_ptr,
shared_layout_ptr->GetBlockSize(SharedDataLayout::GEOMETRIES_FWD_WEIGHT_LIST));
}
EdgeWeight *geometries_rev_weight_list_ptr =
shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST);
EdgeWeight *geometries_rev_weight_list_ptr = shared_layout_ptr->GetBlockPtr<EdgeWeight, true>(
shared_memory_ptr, SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST);
BOOST_ASSERT(temporary_value ==
shared_layout_ptr->num_entries[SharedDataLayout::GEOMETRIES_REV_WEIGHT_LIST]);
@@ -816,6 +813,7 @@ Storage::ReturnCode Storage::Run(int max_wait)
static_cast<SharedDataTimestamp *>(data_type_memory->Ptr());
{
boost::interprocess::scoped_lock<boost::interprocess::named_upgradable_mutex>
current_regions_exclusive_lock;