tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improvements to initialization of linker_allocator

Browse source 
Make linker_allocator independent of the order of global constructors.

Bug: http://b/30483811
Change-Id: I18a323175661b8e1c9e398f2d6112f7a08d2cceb
Test: boot the device with I3ac91758a1a043146c65f2ae0f36fcfbe372c30f
This commit is contained in:
Dimitry Ivanov 2016-07-29 13:25:33 -07:00
parent 4bc6eea83e
commit 65707b696a
2 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
linker/linker_allocator.cpp
View file

@ -70,8 +70,8 @@ static inline uint16_t log2(size_t number) {
return result; return result;
} }
LinkerSmallObjectAllocator::LinkerSmallObjectAllocator() LinkerSmallObjectAllocator::LinkerSmallObjectAllocator(uint32_t type, size_t block_size)
: type_(0), block_size_(0), free_pages_cnt_(0), free_blocks_list_(nullptr) {} : type_(type), block_size_(block_size), free_pages_cnt_(0), free_blocks_list_(nullptr) {}
void* LinkerSmallObjectAllocator::alloc() { void* LinkerSmallObjectAllocator::alloc() {
CHECK(block_size_ != 0); CHECK(block_size_ != 0);
@ -159,11 +159,6 @@ void LinkerSmallObjectAllocator::free(void* ptr) {
} }
} }
void LinkerSmallObjectAllocator::init(uint32_t type, size_t block_size) {
type_ = type;
block_size_ = block_size;
}
linker_vector_t::iterator LinkerSmallObjectAllocator::find_page_record(void* ptr) { linker_vector_t::iterator LinkerSmallObjectAllocator::find_page_record(void* ptr) {
void* addr = reinterpret_cast<void*>(PAGE_START(reinterpret_cast<uintptr_t>(ptr))); void* addr = reinterpret_cast<void*>(PAGE_START(reinterpret_cast<uintptr_t>(ptr)));
small_object_page_record boundary; small_object_page_record boundary;
@ -221,11 +216,20 @@ void LinkerSmallObjectAllocator::alloc_page() {
} }
LinkerMemoryAllocator::LinkerMemoryAllocator() { void LinkerMemoryAllocator::initialize_allocators() {
if (allocators_ != nullptr) {
return;
}
LinkerSmallObjectAllocator* allocators =
reinterpret_cast<LinkerSmallObjectAllocator*>(allocators_buf_);
for (size_t i = 0; i < kSmallObjectAllocatorsCount; ++i) { for (size_t i = 0; i < kSmallObjectAllocatorsCount; ++i) {
uint32_t type = i + kSmallObjectMinSizeLog2; uint32_t type = i + kSmallObjectMinSizeLog2;
allocators_[i].init(type, 1 << type); new (allocators + i) LinkerSmallObjectAllocator(type, 1 << type);
} }
allocators_ = allocators;
} }
void* LinkerMemoryAllocator::alloc_mmap(size_t size) { void* LinkerMemoryAllocator::alloc_mmap(size_t size) {
@ -336,5 +340,6 @@ LinkerSmallObjectAllocator* LinkerMemoryAllocator::get_small_object_allocator(ui
__libc_fatal("invalid type: %u", type); __libc_fatal("invalid type: %u", type);
} }
initialize_allocators();
return &allocators_[type - kSmallObjectMinSizeLog2]; return &allocators_[type - kSmallObjectMinSizeLog2];
} }

9
linker/linker_allocator.h
View file

@ -100,8 +100,7 @@ typedef
class LinkerSmallObjectAllocator { class LinkerSmallObjectAllocator {
public: public:
LinkerSmallObjectAllocator(); LinkerSmallObjectAllocator(uint32_t type, size_t block_size);
void init(uint32_t type, size_t block_size);
void* alloc(); void* alloc();
void free(void* ptr); void free(void* ptr);
@ -124,7 +123,7 @@ class LinkerSmallObjectAllocator {
class LinkerMemoryAllocator { class LinkerMemoryAllocator {
public: public:
LinkerMemoryAllocator(); constexpr LinkerMemoryAllocator() : allocators_(nullptr), allocators_buf_() {}
void* alloc(size_t size); void* alloc(size_t size);
// Note that this implementation of realloc never shrinks allocation // Note that this implementation of realloc never shrinks allocation
@ -134,8 +133,10 @@ class LinkerMemoryAllocator {
void* alloc_mmap(size_t size); void* alloc_mmap(size_t size);
page_info* get_page_info(void* ptr); page_info* get_page_info(void* ptr);
LinkerSmallObjectAllocator* get_small_object_allocator(uint32_t type); LinkerSmallObjectAllocator* get_small_object_allocator(uint32_t type);
void initialize_allocators();
LinkerSmallObjectAllocator allocators_[kSmallObjectAllocatorsCount]; LinkerSmallObjectAllocator* allocators_;
uint8_t allocators_buf_[sizeof(LinkerSmallObjectAllocator)*kSmallObjectAllocatorsCount];
}; };