Changeset 115391 in webkit for trunk/Source/JavaScriptCore/heap/WeakSet.cpp

Timestamp:

Apr 26, 2012, 5:51:47 PM (13 years ago)

Author:

[email protected]

Message:

Allocating WeakImpl should not trigger GC, as that makes the world very tricksy.
​https://bugs.webkit.org/show_bug.cgi?id=85020

Reviewed by Gavin Barraclough.

Now in the event that we are unable to find an allocator for a new handle, just
add a new allocator rather than trying to recover "dead" handles through a GC.

Find allocator is now much simpler, and addAllocator directly reports the
increased memory usage to the heap without causing any GC to happen immediately.

• heap/WeakSet.cpp:

(JSC::WeakSet::findAllocator):
(JSC::WeakSet::addAllocator):

File:

• trunk/Source/JavaScriptCore/heap/WeakSet.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/heap/WeakSet.cpp

@@ -96 +96 @@
         return allocator;
 
-    // FIXME: This reporting of the amount allocated isn't quite accurate and 
-    // probably should be reworked eventually.
-    m_heap->didAllocate(WeakBlock::blockSize);
-    if (m_heap->shouldCollect()) {
-        m_heap->collect(Heap::DoNotSweep);
-
-        if (WeakBlock::FreeCell* allocator = tryFindAllocator())
-            return allocator;
-    }
-
     return addAllocator();
 }
@@ -127 +117 @@
 {
     WeakBlock* block = WeakBlock::create();
+    m_heap->didAllocate(WeakBlock::blockSize);
     m_blocks.append(block);
     WeakBlock::SweepResult sweepResult = block->takeSweepResult();