JavaScriptCore-1218.34.tar.gz

[apple/javascriptcore.git] / heap / WeakSet.h

diff --git a/heap/WeakSet.h b/heap/WeakSet.h
index 0a683bd5f62e126e62c2417266aab3c07b16d49d..580cbe7a96e5d3dd4f6a8fe0b3f1999299dce527 100644 (file)
--- a/heap/WeakSet.h
+++ b/heap/WeakSet.h
@@ -35,20 +35,23 @@ class WeakImpl;
 
 class WeakSet {
 public:
-    WeakSet(Heap*);
-    void finalizeAll();
-    ~WeakSet();
-
     static WeakImpl* allocate(JSValue, WeakHandleOwner* = 0, void* context = 0);
     static void deallocate(WeakImpl*);
 
-    void visitLiveWeakImpls(HeapRootVisitor&);
-    void visitDeadWeakImpls(HeapRootVisitor&);
+    WeakSet(VM*);
+    ~WeakSet();
+    void lastChanceToFinalize();
 
-    void sweep();
-    void resetAllocator();
+    Heap* heap() const;
+    VM* vm() const;
+
+    bool isEmpty() const;
 
+    void visit(HeapRootVisitor&);
+    void reap();
+    void sweep();
     void shrink();
+    void resetAllocator();
 
 private:
     JS_EXPORT_PRIVATE WeakBlock::FreeCell* findAllocator();
@@ -59,21 +62,73 @@ private:
     WeakBlock::FreeCell* m_allocator;
     WeakBlock* m_nextAllocator;
     DoublyLinkedList<WeakBlock> m_blocks;
-    Heap* m_heap;
+    VM* m_vm;
 };
 
-inline WeakSet::WeakSet(Heap* heap)
+inline WeakSet::WeakSet(VM* vm)
     : m_allocator(0)
     , m_nextAllocator(0)
-    , m_heap(heap)
+    , m_vm(vm)
 {
 }
 
+inline VM* WeakSet::vm() const
+{
+    return m_vm;
+}
+
+inline bool WeakSet::isEmpty() const
+{
+    for (WeakBlock* block = m_blocks.head(); block; block = block->next()) {
+        if (!block->isEmpty())
+            return false;
+    }
+
+    return true;
+}
+
 inline void WeakSet::deallocate(WeakImpl* weakImpl)
 {
     weakImpl->setState(WeakImpl::Deallocated);
 }
 
+inline void WeakSet::lastChanceToFinalize()
+{
+    for (WeakBlock* block = m_blocks.head(); block; block = block->next())
+        block->lastChanceToFinalize();
+}
+
+inline void WeakSet::visit(HeapRootVisitor& visitor)
+{
+    for (WeakBlock* block = m_blocks.head(); block; block = block->next())
+        block->visit(visitor);
+}
+
+inline void WeakSet::reap()
+{
+    for (WeakBlock* block = m_blocks.head(); block; block = block->next())
+        block->reap();
+}
+
+inline void WeakSet::shrink()
+{
+    WeakBlock* next;
+    for (WeakBlock* block = m_blocks.head(); block; block = next) {
+        next = block->next();
+
+        if (block->isEmpty())
+            removeAllocator(block);
+    }
+
+    resetAllocator();
+}
+
+inline void WeakSet::resetAllocator()
+{
+    m_allocator = 0;
+    m_nextAllocator = m_blocks.head();
+}
+
 } // namespace JSC
 
 #endif // WeakSet_h