MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-29 18:22:50 +01:00
Code Issues Releases Wiki Activity

ircd::allocator: Add nothrow overload to state / fixed.

Browse source
This commit is contained in:
Jason Volk 2019-02-28 10:40:07 -08:00
parent a600a28095
commit 6ab36254c2
2 changed files with 32 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
include/ircd/allocator.h
View file

@ -127,6 +127,7 @@ struct ircd::allocator::state
public:
bool available(const size_t &n = 1) const;
void deallocate(const uint &p, const size_t &n);
uint allocate(std::nothrow_t, const size_t &n, const uint &hint = -1);
uint allocate(const size_t &n, const uint &hint = -1);
state(const size_t &size = 0,
@ -158,6 +159,12 @@ struct ircd::allocator::fixed
std::array<typename value::type, MAX> buf;
public:
bool in_range(const T *const &ptr) const
{
const auto base(reinterpret_cast<const T *>(buf.data()));
return ptr >= base && ptr < base + MAX;
}
allocator operator()();
operator allocator();
@ -209,6 +216,14 @@ struct ircd::allocator::fixed<T, SIZE>::allocator
return &x;
}
pointer allocate(std::nothrow_t, const size_type &n, const const_pointer &hint = nullptr)
{
const auto base(reinterpret_cast<pointer>(s->buf.data()));
const uint hintpos(hint? hint - base : -1);
const pointer ret(base + s->state::allocate(std::nothrow, n, hintpos));
return s->in_range(ret)? ret : nullptr;
}
pointer allocate(const size_type &n, const const_pointer &hint = nullptr)
{
const auto base(reinterpret_cast<pointer>(s->buf.data()));

18
ircd/allocator.cc
View file

@ -86,10 +86,26 @@ ircd::allocator::state::deallocate(const uint &pos,
uint
ircd::allocator::state::allocate(const size_type &n,
const uint &hint)
{
const auto ret
{
allocate(std::nothrow, n, hint)
};
if(unlikely(ret >= size))
throw std::bad_alloc();
return ret;
}
uint
ircd::allocator::state::allocate(std::nothrow_t,
const size_type &n,
const uint &hint)
{
const auto next(this->next(n));
if(unlikely(next >= size)) // No block of n was found anywhere (next is past-the-end)
throw std::bad_alloc();
return next;
for(size_t i(0); i < n; ++i)
{