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

Timestamp:

Apr 24, 2012, 12:11:12 PM (13 years ago)

Author:

[email protected]

Message:

"GlobalHandle" HandleHeap (now WeakSet) allocations grow but do not shrink
​https://bugs.webkit.org/show_bug.cgi?id=84740
<rdar://problem/9917638>

Reviewed by Gavin Barraclough.

Shrink!

• heap/Heap.cpp:

(JSC::Heap::destroy): Be more specific about what's shrinking, since we
can also shrink the WeakSet, but we don't do so here.

(JSC::Heap::collect): If we're going to shrink the heap, shrink the
WeakSet too. Otherwise, its footprint is permanent.

• heap/Heap.h:

(Heap): Removed shrink() as a public interface, since it's vague about
which parts of the heap it affects, and it's really an internal detail.

• heap/WeakSet.cpp:

(JSC::WeakSet::shrink): Nix any free blocks. We assume that sweep() has
already taken place, since that's the convention for shrink() in the heap.

• heap/WeakSet.h:

(WeakSet): New function!

File:

• trunk/Source/JavaScriptCore/heap/WeakSet.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/heap/WeakSet.cpp

@@ -74 +74 @@
 }
 
+void WeakSet::shrink()
+{
+    WeakBlock* next;
+    for (WeakBlock* block = static_cast<WeakBlock*>(m_blocks.head()); block; block = next) {
+        next = static_cast<WeakBlock*>(block->next());
+
+        if (!block->sweepResult().isNull() && block->sweepResult().blockIsFree)
+            removeAllocator(block);
+    }
+}
+
 void WeakSet::resetAllocator()
 {