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

Set LeafNode alignment to LEAF_PAGE_SIZE bytes

Browse Source 
References:
- https://github.com/Project-OSRM/osrm-backend/pull/2348#issuecomment-219804408
- http://stackoverflow.com/questions/15523537/alignas-specifier-vs-attribute-aligned-c11
- http://stackoverflow.com/questions/7895869/cross-platform-alignx-macro
This commit is contained in:
Michael Krasnyk 2016-05-28 08:45:43 +02:00
parent a5c5faa21d
commit 843f1a6356
No known key found for this signature in database
GPG Key ID: A277FCFBE39A658D
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/util/static_rtree.hpp
View File

@ -32,6 +32,16 @@
#include <string> #include <string>
#include <vector> #include <vector>
// An extended alignment is implementation-defined, so use compiler attributes
// until alignas(LEAF_PAGE_SIZE) is compiler-independent.
#if defined(_MSC_VER)
#define ALIGNED(x) __declspec(align(x))
#elif defined(__GNUC__)
#define ALIGNED(x) __attribute__ ((aligned(x)))
#else
#define ALIGNED(x)
#endif
namespace osrm namespace osrm
{ {
namespace util namespace util
@ -74,13 +84,11 @@ class StaticRTree
std::uint32_t children[BRANCHING_FACTOR]; std::uint32_t children[BRANCHING_FACTOR];
}; };
struct LeafNode struct ALIGNED(LEAF_PAGE_SIZE) LeafNode
{ {
LeafNode() : object_count(0), objects() {} LeafNode() : object_count(0), objects() {}
std::uint32_t object_count; std::uint32_t object_count;
std::array<EdgeDataT, LEAF_NODE_SIZE> objects; std::array<EdgeDataT, LEAF_NODE_SIZE> objects;
unsigned char leaf_page_padding[LEAF_PAGE_SIZE - sizeof(std::uint32_t) -
sizeof(std::array<EdgeDataT, LEAF_NODE_SIZE>)];
}; };
static_assert(sizeof(LeafNode) == LEAF_PAGE_SIZE, "LeafNode size does not fit the page size"); static_assert(sizeof(LeafNode) == LEAF_PAGE_SIZE, "LeafNode size does not fit the page size");