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

Formatting [ci skip]

Browse Source
This commit is contained in:
Lauren Budorick 2016-05-24 10:33:05 -04:00 committed by Daniel J. Hofmann
parent 0c60a2aef8
commit ae3ccb009e
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/engine/datafacade/shared_datafacade.hpp
View File

@ -173,9 +173,11 @@ class SharedDataFacade final : public BaseDataFacade
auto osmnodeid_list_ptr = data_layout->GetBlockPtr<OSMNodeID>( auto osmnodeid_list_ptr = data_layout->GetBlockPtr<OSMNodeID>(
shared_memory, storage::SharedDataLayout::OSM_NODE_ID_LIST); shared_memory, storage::SharedDataLayout::OSM_NODE_ID_LIST);
m_osmnodeid_list.reset(osmnodeid_list_ptr, m_osmnodeid_list.reset(
osmnodeid_list_ptr,
data_layout->num_entries[storage::SharedDataLayout::OSM_NODE_ID_LIST]); data_layout->num_entries[storage::SharedDataLayout::OSM_NODE_ID_LIST]);
m_osmnodeid_list.set_number_of_entries(util::PackedVectorCapacity(data_layout->num_entries[storage::SharedDataLayout::OSM_NODE_ID_LIST])); m_osmnodeid_list.set_number_of_entries(util::PackedVectorCapacity(
data_layout->num_entries[storage::SharedDataLayout::OSM_NODE_ID_LIST]));
auto travel_mode_list_ptr = data_layout->GetBlockPtr<extractor::TravelMode>( auto travel_mode_list_ptr = data_layout->GetBlockPtr<extractor::TravelMode>(
shared_memory, storage::SharedDataLayout::TRAVEL_MODE); shared_memory, storage::SharedDataLayout::TRAVEL_MODE);

22
include/util/packed_vector.hpp
View File

@ -17,7 +17,8 @@ const constexpr std::size_t ELEMSIZE = 64;
const constexpr std::size_t PACKSIZE = BITSIZE * ELEMSIZE; const constexpr std::size_t PACKSIZE = BITSIZE * ELEMSIZE;
/** /**
* Returns the size of the packed vector datastructure with `elements` packed elements (the size of its underlying vector) * Returns the size of the packed vector datastructure with `elements` packed elements (the size of
* its underlying vector)
*/ */
inline std::size_t PackedVectorSize(std::size_t elements) inline std::size_t PackedVectorSize(std::size_t elements)
{ {
@ -40,7 +41,6 @@ inline std::size_t PackedVectorCapacity(std::size_t vec_size)
template <bool UseSharedMemory> class PackedVector template <bool UseSharedMemory> class PackedVector
{ {
public: public:
PackedVector() = default; PackedVector() = default;
void push_back(OSMNodeID incoming_node_id) void push_back(OSMNodeID incoming_node_id)
@ -124,10 +124,7 @@ template <bool UseSharedMemory> class PackedVector
} }
} }
std::size_t size() const std::size_t size() const { return num_elements; }
{
return num_elements;
}
template <bool enabled = UseSharedMemory> template <bool enabled = UseSharedMemory>
void reserve(typename std::enable_if<!enabled, std::size_t>::type capacity) void reserve(typename std::enable_if<!enabled, std::size_t>::type capacity)
@ -136,7 +133,8 @@ template <bool UseSharedMemory> class PackedVector
} }
template <bool enabled = UseSharedMemory> template <bool enabled = UseSharedMemory>
void reset(typename std::enable_if<enabled, OSMNodeID>::type *ptr, typename std::enable_if<enabled, std::size_t>::type size) void reset(typename std::enable_if<enabled, OSMNodeID>::type *ptr,
typename std::enable_if<enabled, std::size_t>::type size)
{ {
vec.reset(reinterpret_cast<std::uint64_t *>(ptr), size); vec.reset(reinterpret_cast<std::uint64_t *>(ptr), size);
} }
@ -147,13 +145,9 @@ template <bool UseSharedMemory> class PackedVector
num_elements = count; num_elements = count;
} }
std::size_t capacity() const std::size_t capacity() const { return PackedVectorCapacity(vec.capacity()); }
{
return PackedVectorCapacity(vec.capacity());
}
private: private:
typename util::ShM<std::uint64_t, UseSharedMemory>::vector vec; typename util::ShM<std::uint64_t, UseSharedMemory>::vector vec;
std::size_t num_elements = 0; std::size_t num_elements = 0;
@ -186,13 +180,13 @@ template <bool UseSharedMemory> class PackedVector
} }
template <bool enabled = UseSharedMemory> template <bool enabled = UseSharedMemory>
std::uint64_t vec_back(typename std::enable_if<enabled>::type* = nullptr) std::uint64_t vec_back(typename std::enable_if<enabled>::type * = nullptr)
{ {
return vec[cursor]; return vec[cursor];
} }
template <bool enabled = UseSharedMemory> template <bool enabled = UseSharedMemory>
std::uint64_t vec_back(typename std::enable_if<!enabled>::type* = nullptr) std::uint64_t vec_back(typename std::enable_if<!enabled>::type * = nullptr)
{ {
return vec.back(); return vec.back();
} }

6
src/storage/storage.cpp
View File

@ -245,7 +245,8 @@ int Storage::Run()
nodes_input_stream.read((char *)&coordinate_list_size, sizeof(unsigned)); nodes_input_stream.read((char *)&coordinate_list_size, sizeof(unsigned));
shared_layout_ptr->SetBlockSize<util::Coordinate>(SharedDataLayout::COORDINATE_LIST, shared_layout_ptr->SetBlockSize<util::Coordinate>(SharedDataLayout::COORDINATE_LIST,
coordinate_list_size); coordinate_list_size);
// we'll read a list of OSM node IDs from the same data, so set the block size for the same number of items: // we'll read a list of OSM node IDs from the same data, so set the block size for the same
// number of items:
shared_layout_ptr->SetBlockSize<OSMNodeID>(SharedDataLayout::OSM_NODE_ID_LIST, shared_layout_ptr->SetBlockSize<OSMNodeID>(SharedDataLayout::OSM_NODE_ID_LIST,
util::PackedVectorSize(coordinate_list_size)); util::PackedVectorSize(coordinate_list_size));
@ -542,7 +543,8 @@ int Storage::Run()
OSMNodeID *osmnodeid_ptr = shared_layout_ptr->GetBlockPtr<OSMNodeID, true>( OSMNodeID *osmnodeid_ptr = shared_layout_ptr->GetBlockPtr<OSMNodeID, true>(
shared_memory_ptr, SharedDataLayout::OSM_NODE_ID_LIST); shared_memory_ptr, SharedDataLayout::OSM_NODE_ID_LIST);
util::PackedVector<true> osmnodeid_list; util::PackedVector<true> osmnodeid_list;
osmnodeid_list.reset(osmnodeid_ptr, shared_layout_ptr->num_entries[storage::SharedDataLayout::OSM_NODE_ID_LIST]); osmnodeid_list.reset(
osmnodeid_ptr, shared_layout_ptr->num_entries[storage::SharedDataLayout::OSM_NODE_ID_LIST]);
extractor::QueryNode current_node; extractor::QueryNode current_node;
for (unsigned i = 0; i < coordinate_list_size; ++i) for (unsigned i = 0; i < coordinate_list_size; ++i)