#define FOLLY_ARENA_H_
#include <cassert>
-#include <utility>
#include <limits>
+#include <stdexcept>
+#include <utility>
#include <boost/intrusive/slist.hpp>
-#include "folly/Likely.h"
-#include "folly/Malloc.h"
+#include <folly/Conv.h>
+#include <folly/Likely.h>
+#include <folly/Malloc.h>
+#include <folly/Memory.h>
namespace folly {
* guaranteed to be rounded up to a multiple of the maximum alignment
* required on your system; the returned value must be also.
*
- * An implementation that uses malloc() / free() is defined below, see
- * SysAlloc / SysArena.
+ * An implementation that uses malloc() / free() is defined below, see SysArena.
*/
template <class Alloc> struct ArenaAllocatorTraits;
template <class Alloc>
public:
explicit Arena(const Alloc& alloc,
size_t minBlockSize = kDefaultMinBlockSize,
- size_t sizeLimit = 0)
+ size_t sizeLimit = kNoSizeLimit,
+ size_t maxAlign = kDefaultMaxAlign)
: allocAndSize_(alloc, minBlockSize)
, ptr_(nullptr)
, end_(nullptr)
, totalAllocatedSize_(0)
, bytesUsed_(0)
- , sizeLimit_(sizeLimit) {
+ , sizeLimit_(sizeLimit)
+ , maxAlign_(maxAlign) {
+ if ((maxAlign_ & (maxAlign_ - 1)) || maxAlign_ > alignof(Block)) {
+ throw std::invalid_argument(
+ folly::to<std::string>("Invalid maxAlign: ", maxAlign_));
+ }
}
~Arena();
private:
Block() { }
~Block() { }
- } __attribute__((aligned));
+ } __attribute__((__aligned__));
// This should be alignas(std::max_align_t) but neither alignas nor
// max_align_t are supported by gcc 4.6.2.
public:
static constexpr size_t kDefaultMinBlockSize = 4096 - sizeof(Block);
+ static constexpr size_t kNoSizeLimit = 0;
+ static constexpr size_t kDefaultMaxAlign = alignof(Block);
+ static constexpr size_t kBlockOverhead = sizeof(Block);
private:
- static constexpr size_t maxAlign = alignof(Block);
- static constexpr bool isAligned(uintptr_t address) {
- return (address & (maxAlign - 1)) == 0;
+ bool isAligned(uintptr_t address) const {
+ return (address & (maxAlign_ - 1)) == 0;
}
- static bool isAligned(void* p) {
+ bool isAligned(void* p) const {
return isAligned(reinterpret_cast<uintptr_t>(p));
}
// Round up size so it's properly aligned
- static constexpr size_t roundUp(size_t size) {
- return (size + maxAlign - 1) & ~(maxAlign - 1);
+ size_t roundUp(size_t size) const {
+ return (size + maxAlign_ - 1) & ~(maxAlign_ - 1);
}
// cache_last<true> makes the list keep a pointer to the last element, so we
char* end_;
size_t totalAllocatedSize_;
size_t bytesUsed_;
- size_t sizeLimit_;
+ const size_t sizeLimit_;
+ const size_t maxAlign_;
};
+template <class Alloc>
+struct IsArenaAllocator<Arena<Alloc>> : std::true_type { };
+
/**
* By default, don't pad the given size.
*/
}
};
-/**
- * Arena-compatible allocator that calls malloc() and free(); see
- * goodMallocSize() in Malloc.h for goodSize().
- */
-class SysAlloc {
- public:
- void* allocate(size_t size) {
- return checkedMalloc(size);
- }
-
- void deallocate(void* p) {
- free(p);
- }
-};
-
template <>
struct ArenaAllocatorTraits<SysAlloc> {
static size_t goodSize(const SysAlloc& alloc, size_t size) {
*/
class SysArena : public Arena<SysAlloc> {
public:
- explicit SysArena(
- size_t minBlockSize = kDefaultMinBlockSize,
- size_t sizeLimit = 0)
- : Arena<SysAlloc>(SysAlloc(), minBlockSize, sizeLimit) {
+ explicit SysArena(size_t minBlockSize = kDefaultMinBlockSize,
+ size_t sizeLimit = kNoSizeLimit,
+ size_t maxAlign = kDefaultMaxAlign)
+ : Arena<SysAlloc>(SysAlloc(), minBlockSize, sizeLimit, maxAlign) {
}
};
+template <>
+struct IsArenaAllocator<SysArena> : std::true_type { };
+
} // namespace folly
-#include "folly/Arena-inl.h"
+#include <folly/Arena-inl.h>
#endif /* FOLLY_ARENA_H_ */