Changeset 113508 in webkit for trunk/Source/JavaScriptCore/heap/HandleSet.h

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/HandleSet.h (moved) (moved from trunk/Source/JavaScriptCore/heap/HandleHeap.h ) (10 diffs)

trunk/Source/JavaScriptCore/heap/HandleSet.h

@@ -24 +24 @@
  */
 
-#ifndef HandleHeap_h
-#define HandleHeap_h
+#ifndef HandleSet_h
+#define HandleSet_h
 
 #include <wtf/BlockStack.h>
@@ -35 +35 @@
 namespace JSC {
 
-class HandleHeap;
+class HandleSet;
 class HeapRootVisitor;
 class JSGlobalData;
@@ -41 +41 @@
 class SlotVisitor;
 
-class HandleHeap {
+class HandleSet {
 public:
-    static HandleHeap* heapFor(HandleSlot);
-
-    HandleHeap(JSGlobalData*);
+    static HandleSet* heapFor(HandleSlot);
+
+    HandleSet(JSGlobalData*);
     
     JSGlobalData* globalData();
@@ -64 +64 @@
     public:
         Node(WTF::SentinelTag);
-        Node(HandleHeap*);
+        Node(HandleSet*);
         
         HandleSlot slot();
-        HandleHeap* handleHeap();
+        HandleSet* handleSet();
 
         void setPrev(Node*);
@@ -77 +77 @@
     private:
         JSValue m_value;
-        HandleHeap* m_handleHeap;
+        HandleSet* m_handleSet;
         Node* m_prev;
         Node* m_next;
@@ -100 +100 @@
 };
 
-inline HandleHeap* HandleHeap::heapFor(HandleSlot handle)
-{
-    return toNode(handle)->handleHeap();
-}
-
-inline JSGlobalData* HandleHeap::globalData()
+inline HandleSet* HandleSet::heapFor(HandleSlot handle)
+{
+    return toNode(handle)->handleSet();
+}
+
+inline JSGlobalData* HandleSet::globalData()
 {
     return m_globalData;
 }
 
-inline HandleSlot HandleHeap::toHandle(Node* node)
+inline HandleSlot HandleSet::toHandle(Node* node)
 {
     return reinterpret_cast<HandleSlot>(node);
 }
 
-inline HandleHeap::Node* HandleHeap::toNode(HandleSlot handle)
+inline HandleSet::Node* HandleSet::toNode(HandleSlot handle)
 {
     return reinterpret_cast<Node*>(handle);
 }
 
-inline HandleSlot HandleHeap::allocate()
+inline HandleSlot HandleSet::allocate()
 {
     // Forbid assignment to handles during the finalization phase, since it would violate many GC invariants.
@@ -135 +135 @@
 }
 
-inline void HandleHeap::deallocate(HandleSlot handle)
+inline void HandleSet::deallocate(HandleSlot handle)
 {
     Node* node = toNode(handle);
@@ -147 +147 @@
 }
 
-inline HandleHeap::Node::Node(HandleHeap* handleHeap)
-    : m_handleHeap(handleHeap)
+inline HandleSet::Node::Node(HandleSet* handleSet)
+    : m_handleSet(handleSet)
     , m_prev(0)
     , m_next(0)
@@ -154 +154 @@
 }
 
-inline HandleHeap::Node::Node(WTF::SentinelTag)
-    : m_handleHeap(0)
+inline HandleSet::Node::Node(WTF::SentinelTag)
+    : m_handleSet(0)
     , m_prev(0)
     , m_next(0)
@@ -161 +161 @@
 }
 
-inline HandleSlot HandleHeap::Node::slot()
+inline HandleSlot HandleSet::Node::slot()
 {
     return &m_value;
 }
 
-inline HandleHeap* HandleHeap::Node::handleHeap()
-{
-    return m_handleHeap;
-}
-
-inline void HandleHeap::Node::setPrev(Node* prev)
+inline HandleSet* HandleSet::Node::handleSet()
+{
+    return m_handleSet;
+}
+
+inline void HandleSet::Node::setPrev(Node* prev)
 {
     m_prev = prev;
 }
 
-inline HandleHeap::Node* HandleHeap::Node::prev()
+inline HandleSet::Node* HandleSet::Node::prev()
 {
     return m_prev;
 }
 
-inline void HandleHeap::Node::setNext(Node* next)
+inline void HandleSet::Node::setNext(Node* next)
 {
     m_next = next;
 }
 
-inline HandleHeap::Node* HandleHeap::Node::next()
+inline HandleSet::Node* HandleSet::Node::next()
 {
     return m_next;
 }
 
-template<typename Functor> void HandleHeap::forEachStrongHandle(Functor& functor, const HashCountedSet<JSCell*>& skipSet)
+template<typename Functor> void HandleSet::forEachStrongHandle(Functor& functor, const HashCountedSet<JSCell*>& skipSet)
 {
     Node* end = m_strongList.end();