Changeset 133812 in webkit for trunk/Source/JavaScriptCore/heap/WeakBlock.cpp

Timestamp:

Nov 7, 2012, 3:34:30 PM (13 years ago)

Author:

[email protected]

Message:

WeakBlocks should be HeapBlocks
​https://bugs.webkit.org/show_bug.cgi?id=101411

Reviewed by Oliver Hunt.

Currently WeakBlocks use fastMalloc memory. They are very similar to the other HeapBlocks, however,
so we should change them to being allocated with the BlockAllocator.

• heap/BlockAllocator.cpp:

(JSC::BlockAllocator::BlockAllocator):

• heap/BlockAllocator.h: Added a new RegionSet for WeakBlocks.

(JSC):
(BlockAllocator):
(JSC::WeakBlock):

• heap/Heap.h: Friended WeakSet to allow access to the BlockAllocator.

(Heap):

• heap/WeakBlock.cpp:

(JSC::WeakBlock::create): Refactored to use HeapBlocks rather than fastMalloc.
(JSC::WeakBlock::WeakBlock):

• heap/WeakBlock.h: Changed the WeakBlock size to 4 KB so that it divides evenly into the Region size.

(JSC):
(WeakBlock):

• heap/WeakSet.cpp:

(JSC::WeakSet::~WeakSet):
(JSC::WeakSet::addAllocator):

File:

• trunk/Source/JavaScriptCore/heap/WeakBlock.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/heap/WeakBlock.cpp

@@ -35 +35 @@
 namespace JSC {
 
-WeakBlock* WeakBlock::create()
+WeakBlock* WeakBlock::create(DeadBlock* block)
 {
-    void* allocation = fastMalloc(blockSize);
-    return new (NotNull, allocation) WeakBlock;
+    Region* region = block->region();
+    return new (NotNull, block) WeakBlock(region);
 }
 
-void WeakBlock::destroy(WeakBlock* block)
-{
-    fastFree(block);
-}
-
-WeakBlock::WeakBlock()
+WeakBlock::WeakBlock(Region* region)
+    : HeapBlock<WeakBlock>(region)
 {
     for (size_t i = 0; i < weakImplCount(); ++i) {