Commit be9208fe authored by Kent Tamura's avatar Kent Tamura Committed by Commit Bot

PartitionAlloc: Remove memory_reclaimer.h dependency from partition_alloc.h

This CL reduces the estimated pre-processed size of partition_alloc.h
by 160KB.

This CL has no behavior changes. This CL affects 8,400+ compilation
units.

Bug: 242216
Change-Id: I7cfa2a79f8ed7604fcd71fef2ec21cfa11b295a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2297026
Commit-Queue: Kentaro Hara <haraken@chromium.org>
Auto-Submit: Kent Tamura <tkent@chromium.org>
Reviewed-by: default avatarKentaro Hara <haraken@chromium.org>
Cr-Commit-Position: refs/heads/master@{#788394}
parent 50602dd1
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <memory> #include <memory>
#include "base/allocator/partition_allocator/memory_reclaimer.h"
#include "base/allocator/partition_allocator/oom.h" #include "base/allocator/partition_allocator/oom.h"
#include "base/allocator/partition_allocator/page_allocator_internal.h" #include "base/allocator/partition_allocator/page_allocator_internal.h"
#include "base/allocator/partition_allocator/partition_alloc_features.h" #include "base/allocator/partition_allocator/partition_alloc_features.h"
...@@ -808,4 +809,32 @@ void PartitionRoot<thread_safe>::DumpStats(const char* partition_name, ...@@ -808,4 +809,32 @@ void PartitionRoot<thread_safe>::DumpStats(const char* partition_name,
template struct BASE_EXPORT PartitionRoot<internal::ThreadSafe>; template struct BASE_EXPORT PartitionRoot<internal::ThreadSafe>;
template struct BASE_EXPORT PartitionRoot<internal::NotThreadSafe>; template struct BASE_EXPORT PartitionRoot<internal::NotThreadSafe>;
namespace internal {
template <bool thread_safe>
PartitionAllocator<thread_safe>::~PartitionAllocator() {
PartitionAllocMemoryReclaimer::Instance()->UnregisterPartition(
&partition_root_);
}
template <bool thread_safe>
void PartitionAllocator<thread_safe>::init(
PartitionAllocatorAlignment alignment) {
partition_root_.Init(
alignment ==
PartitionAllocatorAlignment::kAlignedAlloc /* enforce_alignment */);
PartitionAllocMemoryReclaimer::Instance()->RegisterPartition(
&partition_root_);
}
template void PartitionAllocator<internal::ThreadSafe>::~PartitionAllocator();
template void PartitionAllocator<internal::ThreadSafe>::init(
PartitionAllocatorAlignment alignment);
template void
PartitionAllocator<internal::NotThreadSafe>::~PartitionAllocator();
template void PartitionAllocator<internal::NotThreadSafe>::init(
PartitionAllocatorAlignment alignment);
} // namespace internal
} // namespace base } // namespace base
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
#include <atomic> #include <atomic>
#include "base/allocator/partition_allocator/memory_reclaimer.h"
#include "base/allocator/partition_allocator/page_allocator.h" #include "base/allocator/partition_allocator/page_allocator.h"
#include "base/allocator/partition_allocator/partition_address_space.h" #include "base/allocator/partition_allocator/partition_address_space.h"
#include "base/allocator/partition_allocator/partition_alloc_check.h" #include "base/allocator/partition_allocator/partition_alloc_check.h"
...@@ -920,19 +919,10 @@ namespace internal { ...@@ -920,19 +919,10 @@ namespace internal {
template <bool thread_safe> template <bool thread_safe>
struct BASE_EXPORT PartitionAllocator { struct BASE_EXPORT PartitionAllocator {
PartitionAllocator() = default; PartitionAllocator() = default;
~PartitionAllocator() { ~PartitionAllocator();
PartitionAllocMemoryReclaimer::Instance()->UnregisterPartition(
&partition_root_);
}
void init(PartitionAllocatorAlignment alignment = void init(PartitionAllocatorAlignment alignment =
PartitionAllocatorAlignment::kRegular) { PartitionAllocatorAlignment::kRegular);
partition_root_.Init(
alignment ==
PartitionAllocatorAlignment::kAlignedAlloc /* enforce_alignment */);
PartitionAllocMemoryReclaimer::Instance()->RegisterPartition(
&partition_root_);
}
ALWAYS_INLINE PartitionRoot<thread_safe>* root() { return &partition_root_; } ALWAYS_INLINE PartitionRoot<thread_safe>* root() { return &partition_root_; }
private: private:
......
...@@ -7,6 +7,8 @@ ...@@ -7,6 +7,8 @@
#include "base/allocator/partition_allocator/partition_alloc.h" #include "base/allocator/partition_allocator/partition_alloc.h"
#include "base/allocator/partition_allocator/partition_alloc_check.h" #include "base/allocator/partition_allocator/partition_alloc_check.h"
#include "base/bind.h"
#include "base/callback.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/threading/platform_thread.h" #include "base/threading/platform_thread.h"
#include "base/time/time.h" #include "base/time/time.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment