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

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.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/heap/WeakBlock.h

@@ -35 +35 @@
 namespace JSC {
 
+class DeadBlock;
 class HeapRootVisitor;
 class JSValue;
 class WeakHandleOwner;
 
-class WeakBlock : public DoublyLinkedListNode<WeakBlock> {
+class WeakBlock : public HeapBlock<WeakBlock> {
 public:
     friend class WTF::DoublyLinkedListNode<WeakBlock>;
-    static const size_t blockSize = 3 * KB; // 5% of MarkedBlock size
+    static const size_t blockSize = 4 * KB; // 5% of MarkedBlock size
 
     struct FreeCell {
@@ -56 +57 @@
     };
 
-    static WeakBlock* create();
-    static void destroy(WeakBlock*);
+    static WeakBlock* create(DeadBlock*);
 
     static WeakImpl* asWeakImpl(FreeCell*);
@@ -74 +74 @@
     static FreeCell* asFreeCell(WeakImpl*);
 
-    WeakBlock();
+    WeakBlock(Region*);
     WeakImpl* firstWeakImpl();
     void finalize(WeakImpl*);
@@ -81 +81 @@
     void addToFreeList(FreeCell**, WeakImpl*);
 
-    WeakBlock* m_prev;
-    WeakBlock* m_next;
     SweepResult m_sweepResult;
 };