/*
- * Copyright 2013 Facebook, Inc.
+ * Copyright 2016 Facebook, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* limitations under the License.
*/
-#include "folly/ThreadCachedArena.h"
+#include <folly/ThreadCachedArena.h>
+
+#include <memory>
namespace folly {
-ThreadCachedArena::ThreadCachedArena(size_t minBlockSize)
- : minBlockSize_(minBlockSize) {
+ThreadCachedArena::ThreadCachedArena(size_t minBlockSize, size_t maxAlign)
+ : minBlockSize_(minBlockSize), maxAlign_(maxAlign) {
}
SysArena* ThreadCachedArena::allocateThreadLocalArena() {
- SysArena* arena = new SysArena(minBlockSize_);
+ SysArena* arena =
+ new SysArena(minBlockSize_, SysArena::kNoSizeLimit, maxAlign_);
auto disposer = [this] (SysArena* t, TLPDestructionMode mode) {
std::unique_ptr<SysArena> tp(t); // ensure it gets deleted
if (mode == TLPDestructionMode::THIS_THREAD) {
}
void ThreadCachedArena::zombify(SysArena&& arena) {
- std::lock_guard<std::mutex> lock(zombiesMutex_);
- zombies_.merge(std::move(arena));
+ zombies_->merge(std::move(arena));
}
-} // namespace folly
+size_t ThreadCachedArena::totalSize() const {
+ size_t result = sizeof(ThreadCachedArena);
+ for (const auto& arena : arena_.accessAllThreads()) {
+ result += arena.totalSize();
+ }
+ result += zombies_->totalSize() - sizeof(SysArena);
+ return result;
+}
+} // namespace folly