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

ircd::buffer: Use runtime alignment for unique_buffer rather than template value.

Browse source
This commit is contained in:
Jason Volk 2018-11-09 15:55:20 -08:00
parent 9e97ac0564
commit 382dc67ca1
2 changed files with 20 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/ircd/buffer/buffer.h
View file

@ -38,7 +38,7 @@ namespace ircd::buffer
struct mutable_buffer;
struct window_buffer;
template<class buffer, size_t SIZE> struct fixed_buffer;
template<class buffer, uint align = 16> struct unique_buffer;
template<class buffer> struct unique_buffer;
template<class buffer> struct shared_buffer;
template<size_t SIZE> using fixed_const_buffer = fixed_buffer<const_buffer, SIZE>;

55
include/ircd/buffer/unique_buffer.h
View file

@ -18,16 +18,13 @@ namespace ircd::buffer
/// Like unique_ptr, this template holds ownership of an allocated buffer
///
template<class buffer,
uint alignment>
template<class buffer>
struct ircd::buffer::unique_buffer
:buffer
{
static char *allocate(const size_t &size);
buffer release();
unique_buffer(const size_t &size);
unique_buffer(const size_t &size, const size_t &align = 0);
explicit unique_buffer(const buffer &);
unique_buffer();
unique_buffer(unique_buffer &&) noexcept;
@ -37,18 +34,16 @@ struct ircd::buffer::unique_buffer
~unique_buffer() noexcept;
};
template<class buffer,
uint alignment>
ircd::buffer::unique_buffer<buffer, alignment>::unique_buffer()
template<class buffer>
ircd::buffer::unique_buffer<buffer>::unique_buffer()
:buffer
{
nullptr, nullptr
}
{}
template<class buffer,
uint alignment>
ircd::buffer::unique_buffer<buffer, alignment>::unique_buffer(const buffer &src)
template<class buffer>
ircd::buffer::unique_buffer<buffer>::unique_buffer(const buffer &src)
:unique_buffer
{
size(src)
@ -62,19 +57,18 @@ ircd::buffer::unique_buffer<buffer, alignment>::unique_buffer(const buffer &src)
copy(dst, src);
}
template<class buffer,
uint alignment>
ircd::buffer::unique_buffer<buffer, alignment>::unique_buffer(const size_t &size)
template<class buffer>
ircd::buffer::unique_buffer<buffer>::unique_buffer(const size_t &size,
const size_t &align)
:buffer
{
allocate(size), size
aligned_alloc(align, size).release(), size
}
{
}
template<class buffer,
uint alignment>
ircd::buffer::unique_buffer<buffer, alignment>::unique_buffer(unique_buffer &&other)
template<class buffer>
ircd::buffer::unique_buffer<buffer>::unique_buffer(unique_buffer &&other)
noexcept
:buffer
{
@ -84,10 +78,9 @@ noexcept
get<0>(other) = nullptr;
}
template<class buffer,
uint alignment>
ircd::buffer::unique_buffer<buffer, alignment> &
ircd::buffer::unique_buffer<buffer, alignment>::operator=(unique_buffer &&other)
template<class buffer>
ircd::buffer::unique_buffer<buffer> &
ircd::buffer::unique_buffer<buffer>::operator=(unique_buffer &&other)
noexcept
{
this->~unique_buffer();
@ -98,32 +91,22 @@ noexcept
return *this;
}
template<class buffer,
uint alignment>
ircd::buffer::unique_buffer<buffer, alignment>::~unique_buffer()
template<class buffer>
ircd::buffer::unique_buffer<buffer>::~unique_buffer()
noexcept
{
std::free(const_cast<char *>(data(*this)));
}
template<class buffer,
uint alignment>
template<class buffer>
buffer
ircd::buffer::unique_buffer<buffer, alignment>::release()
ircd::buffer::unique_buffer<buffer>::release()
{
const buffer ret{static_cast<buffer>(*this)};
static_cast<buffer &>(*this) = buffer{};
return ret;
}
template<class buffer,
uint alignment>
char *
ircd::buffer::unique_buffer<buffer, alignment>::allocate(const size_t &size)
{
return aligned_alloc(alignment, size).release();
}
inline std::unique_ptr<char, decltype(&std::free)>
ircd::buffer::aligned_alloc(const size_t &align,
const size_t &size)