Oilpan: Move HeapAllocator methods to HeapAllocator.h

Source/platform/heap/Heap.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 2483 matching lines @@
         state->setGCState(ThreadState::GCRunning);
         state->makeConsistentForSweeping();
         objectPayloadSize += state->objectPayloadSizeForTesting();
         state->setGCState(ThreadState::EagerSweepScheduled);
         state->setGCState(ThreadState::Sweeping);
         state->setGCState(ThreadState::NoGCScheduled);
     }
     return objectPayloadSize;
 }
 
-void HeapAllocator::backingFree(void* address)
-{
-    if (!address)
-        return;
-
-    ThreadState* state = ThreadState::current();
-    if (state->sweepForbidden())
-        return;
-    ASSERT(!state->isInGC());
-
-    // Don't promptly free large objects because their page is never reused.
-    // Don't free backings allocated on other threads.
-    BasePage* page = pageFromObject(address);
-    if (page->isLargeObjectPage() || page->heap()->threadState() != state)
-        return;
-
-    HeapObjectHeader* header = HeapObjectHeader::fromPayload(address);
-    header->checkHeader();
-    NormalPageHeap* heap = static_cast<NormalPage*>(page)->heapForNormalPage();
-    state->promptlyFreed(header->gcInfoIndex());
-    heap->promptlyFreeObject(header);
-}
-
-void HeapAllocator::freeVectorBacking(void* address)
-{
-    backingFree(address);
-}
-
-void HeapAllocator::freeInlineVectorBacking(void* address)
-{
-    backingFree(address);
-}
-
-void HeapAllocator::freeHashTableBacking(void* address)
-{
-    backingFree(address);
-}
-
-bool HeapAllocator::backingExpand(void* address, size_t newSize)
-{
-    if (!address)
-        return false;
-
-    ThreadState* state = ThreadState::current();
-    if (state->sweepForbidden())
-        return false;
-    ASSERT(!state->isInGC());
-    ASSERT(state->isAllocationAllowed());
-
-    // FIXME: Support expand for large objects.
-    // Don't expand backings allocated on other threads.
-    BasePage* page = pageFromObject(address);
-    if (page->isLargeObjectPage() || page->heap()->threadState() != state)
-        return false;
-
-    HeapObjectHeader* header = HeapObjectHeader::fromPayload(address);
-    header->checkHeader();
-    NormalPageHeap* heap = static_cast<NormalPage*>(page)->heapForNormalPage();
-    bool succeed = heap->expandObject(header, newSize);
-    if (succeed)
-        state->allocationPointAdjusted(heap->heapIndex());
-    return succeed;
-}
-
-bool HeapAllocator::expandVectorBacking(void* address, size_t newSize)
-{
-    return backingExpand(address, newSize);
-}
-
-bool HeapAllocator::expandInlineVectorBacking(void* address, size_t newSize)
-{
-    return backingExpand(address, newSize);
-}
-
-bool HeapAllocator::expandHashTableBacking(void* address, size_t newSize)
-{
-    return backingExpand(address, newSize);
-}
-
-void HeapAllocator::backingShrink(void* address, size_t quantizedCurrentSize, size_t quantizedShrunkSize)
-{
-    // We shrink the object only if the shrinking will make a non-small
-    // prompt-free block.
-    // FIXME: Optimize the threshold size.
-    if (quantizedCurrentSize <= quantizedShrunkSize + sizeof(HeapObjectHeader) + sizeof(void*) * 32)
-        return;
-
-    if (!address)
-        return;
-
-    ThreadState* state = ThreadState::current();
-    if (state->sweepForbidden())
-        return;
-    ASSERT(!state->isInGC());
-    ASSERT(state->isAllocationAllowed());
-
-    // FIXME: Support shrink for large objects.
-    // Don't shrink backings allocated on other threads.
-    BasePage* page = pageFromObject(address);
-    if (page->isLargeObjectPage() || page->heap()->threadState() != state)
-        return;
-
-    HeapObjectHeader* header = HeapObjectHeader::fromPayload(address);
-    header->checkHeader();
-    NormalPageHeap* heap = static_cast<NormalPage*>(page)->heapForNormalPage();
-    bool succeed = heap->shrinkObject(header, quantizedShrunkSize);
-    if (succeed)
-        state->allocationPointAdjusted(heap->heapIndex());
-}
-
 BasePage* Heap::lookup(Address address)
 {
     ASSERT(ThreadState::current()->isInGC());
     if (!s_regionTree)
         return nullptr;
     if (PageMemoryRegion* region = s_regionTree->lookup(address)) {
         BasePage* page = region->pageFromAddress(address);
         return page && !page->orphaned() ? page : nullptr;
     }
     return nullptr;
@@ skipping 101 matching lines @@
 size_t Heap::s_allocatedObjectSize = 0;
 size_t Heap::s_allocatedSpace = 0;
 size_t Heap::s_markedObjectSize = 0;
 // We don't want to use 0 KB for the initial value because it may end up
 // triggering the first GC of some thread too prematurely.
 size_t Heap::s_estimatedLiveObjectSize = 512 * 1024;
 size_t Heap::s_externalObjectSizeAtLastGC = 0;
 double Heap::s_estimatedMarkingTimePerByte = 0.0;
 
 } // namespace blink