Changeset 200884 in webkit

Timestamp:

May 13, 2016, 2:24:34 PM (9 years ago)

Author:

ggaren@apple.com

Message:

Runaway malloc memory usage in this simple JSC program
​https://bugs.webkit.org/show_bug.cgi?id=157682

Reviewed by Mark Lam.

• heap/WeakSet.cpp:

(JSC::WeakSet::sweep): Whenever we might add a block to
m_logicallyEmptyWeakBlocks, be sure also to sweep a block in
m_logicallyEmptyWeakBlocks. Otherwise, additions might outpace removals
even when all memory is freed.

We do this whenever we *might* add a block and not just whenever we *do*
add a block because we'd like to sweep the entries in
m_logicallyEmptyWeakBlocks promptly even when it's not growing, and this
is a reasonably rate-limited opportunity to do so.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/WeakSet.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-05-13  Geoffrey Garen  <ggaren@apple.com>
+
+        Runaway malloc memory usage in this simple JSC program
+        https://bugs.webkit.org/show_bug.cgi?id=157682
+
+        Reviewed by Mark Lam.
+
+        * heap/WeakSet.cpp:
+        (JSC::WeakSet::sweep): Whenever we might add a block to
+        m_logicallyEmptyWeakBlocks, be sure also to sweep a block in
+        m_logicallyEmptyWeakBlocks. Otherwise, additions might outpace removals
+        even when all memory is freed.
+
+        We do this whenever we *might* add a block and not just whenever we *do*
+        add a block because we'd like to sweep the entries in
+        m_logicallyEmptyWeakBlocks promptly even when it's not growing, and this
+        is a reasonably rate-limited opportunity to do so.
+
 2016-05-13  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/heap/WeakSet.cpp

@@ -47 +47 @@
 {
     for (WeakBlock* block = m_blocks.head(); block;) {
+        heap()->sweepNextLogicallyEmptyWeakBlock();
+
         WeakBlock* nextBlock = block->next();
         block->sweep();