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

Make the block size of vector<bool> consistent

Browse Source
This commit is contained in:
Patrick Niklaus
2018-03-23 12:02:20 +00:00
parent c0dd5d7c76
commit c322d93435
6 changed files with 49 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/util/packed_vector.hpp
+2 -2
View File
@@ -436,7 +436,7 @@ template <typename T, std::size_t Bits, storage::Ownership Ownership> class Pack
void resize(std::size_t elements)
{
num_elements = elements;
auto num_blocks = std::ceil(static_cast<double>(elements) / BLOCK_ELEMENTS);
auto num_blocks = (elements + BLOCK_ELEMENTS - 1) / BLOCK_ELEMENTS;
vec.resize(num_blocks * BLOCK_WORDS + 1);
}
@@ -445,7 +445,7 @@ template <typename T, std::size_t Bits, storage::Ownership Ownership> class Pack
template <bool enabled = (Ownership == storage::Ownership::View)>
void reserve(typename std::enable_if<!enabled, std::size_t>::type capacity)
{
auto num_blocks = std::ceil(static_cast<double>(capacity) / BLOCK_ELEMENTS);
auto num_blocks = (capacity + BLOCK_ELEMENTS - 1) / BLOCK_ELEMENTS;
vec.reserve(num_blocks * BLOCK_WORDS + 1);
}
include/util/vector_view.hpp
+19 -16
View File
@@ -150,11 +150,14 @@ template <typename DataT> class vector_view
template <> class vector_view<bool>
{
private:
unsigned *m_ptr;
std::size_t m_size;
public:
using Word = std::uint64_t;
static constexpr std::size_t UNSIGNED_BITS = CHAR_BIT * sizeof(unsigned);
private:
static constexpr std::size_t WORD_BITS = CHAR_BIT * sizeof(Word);
Word *m_ptr;
std::size_t m_size;
public:
using value_type = bool;
@@ -178,23 +181,23 @@ template <> class vector_view<bool>
return os << static_cast<bool>(rhs);
}
unsigned *m_ptr;
const unsigned mask;
Word *m_ptr;
const Word mask;
};
vector_view() : m_ptr(nullptr), m_size(0) {}
vector_view(unsigned *ptr, std::size_t size) : m_ptr(ptr), m_size(size) {}
vector_view(Word *ptr, std::size_t size) : m_ptr(ptr), m_size(size) {}
bool at(const std::size_t index) const
{
BOOST_ASSERT_MSG(index < m_size, "invalid size");
const std::size_t bucket = index / UNSIGNED_BITS;
const unsigned offset = index % UNSIGNED_BITS;
return m_ptr[bucket] & (1u << offset);
const std::size_t bucket = index / WORD_BITS;
const auto offset = index % WORD_BITS;
return m_ptr[bucket] & (static_cast<Word>(1) << offset);
}
void reset(unsigned *ptr, std::size_t size)
void reset(std::uint64_t *ptr, std::size_t size)
{
m_ptr = ptr;
m_size = size;
@@ -213,14 +216,14 @@ template <> class vector_view<bool>
bool empty() const { return 0 == size(); }
bool operator[](const unsigned index) const { return at(index); }
bool operator[](const std::size_t index) const { return at(index); }
reference operator[](const unsigned index)
reference operator[](const std::size_t index)
{
BOOST_ASSERT(index < m_size);
const std::size_t bucket = index / UNSIGNED_BITS;
const unsigned offset = index % UNSIGNED_BITS;
return reference{m_ptr + bucket, 1u << offset};
const auto bucket = index / WORD_BITS;
const auto offset = index % WORD_BITS;
return reference{m_ptr + bucket, static_cast<Word>(1) << offset};
}
template <typename T> friend void swap(vector_view<T> &, vector_view<T> &) noexcept;