Changeset 113508 in webkit for trunk/Source/JavaScriptCore/heap/Heap.cpp

Timestamp:

Apr 6, 2012, 3:35:55 PM (13 years ago)

Author:

[email protected]

Message:

Renamed

WeakHeap => WeakSet
HandleHeap => HandleSet

Reviewed by Sam Weinig.

These sets do have internal allocators, but it's confusing to call them
heaps because they're sub-objects of an object called "heap".

• heap/HandleHeap.cpp: Removed.
• heap/HandleHeap.h: Removed.
• heap/HandleSet.cpp: Copied from JavaScriptCore/heap/HandleHeap.cpp.
• heap/WeakHeap.cpp: Removed.
• heap/WeakHeap.h: Removed.
• heap/WeakSet.cpp: Copied from JavaScriptCore/heap/WeakHeap.cpp.
• heap/WeakSet.h: Copied from JavaScriptCore/heap/WeakHeap.h.

Plus global rename using grep.

File:

• trunk/Source/JavaScriptCore/heap/Heap.cpp (modified) (9 diffs)

trunk/Source/JavaScriptCore/heap/Heap.cpp

@@ -324 +324 @@
     , m_sharedData(globalData)
     , m_slotVisitor(m_sharedData)
-    , m_weakHeap(this)
-    , m_handleHeap(globalData)
+    , m_weakSet(this)
+    , m_handleSet(globalData)
     , m_isSafeToCollect(false)
     , m_globalData(globalData)
@@ -376 +376 @@
     clearMarks();
 
-    m_weakHeap.finalizeAll();
+    m_weakSet.finalizeAll();
     m_globalData->smallStrings.finalizeSmallStrings();
     shrink();
@@ -661 +661 @@
         {
             GCPHASE(VisitStrongHandles);
-            m_handleHeap.visitStrongHandles(heapRootVisitor);
+            m_handleSet.visitStrongHandles(heapRootVisitor);
             visitor.donateAndDrain();
         }
@@ -690 +690 @@
         GCPHASE(VisitingLiveWeakHandles);
         while (true) {
-            m_weakHeap.visitLiveWeakImpls(heapRootVisitor);
+            m_weakSet.visitLiveWeakImpls(heapRootVisitor);
             harvestWeakReferences();
             if (visitor.isEmpty())
@@ -706 +706 @@
     {
         GCPHASE(VisitingDeadWeakHandles);
-        m_weakHeap.visitDeadWeakImpls(heapRootVisitor);
+        m_weakSet.visitDeadWeakImpls(heapRootVisitor);
     }
 
@@ -819 +819 @@
     {
         GCPHASE(FinalizeWeakHandles);
-        m_weakHeap.sweep();
+        m_weakSet.sweep();
         m_globalData->smallStrings.finalizeSmallStrings();
     }
@@ -867 +867 @@
 {
     m_objectSpace.resetAllocators();
-    m_weakHeap.resetAllocator();
+    m_weakSet.resetAllocator();
 }
 
@@ -928 +928 @@
 void Heap::addFinalizer(JSCell* cell, Finalizer finalizer)
 {
-    weakHeap()->allocate(cell, &m_finalizerOwner, reinterpret_cast<void*>(finalizer)); // Balanced by FinalizerOwner::finalize().
+    weakSet()->allocate(cell, &m_finalizerOwner, reinterpret_cast<void*>(finalizer)); // Balanced by FinalizerOwner::finalize().
 }
 
@@ -936 +936 @@
     Finalizer finalizer = reinterpret_cast<Finalizer>(context);
     finalizer(slot->asCell());
-    WeakHeap::deallocate(WeakImpl::asWeakImpl(slot));
+    WeakSet::deallocate(WeakImpl::asWeakImpl(slot));
 }