Changeset 196251 in webkit

Timestamp:

Feb 8, 2016 8:25:22 AM (8 years ago)

Author:

akling@apple.com

Message:

Visiting a WeakBlock should report bytes visited, since we reported them allocated.
<​https://webkit.org/b/153978>

Reviewed by Darin Adler.

When creating a WeakBlock, we tell Heap that we've allocated 1 KB (WeakBlock::blockSize)
of memory. Consequently, when visiting a WeakBlock, we should also report 1 KB of memory
visited. Otherwise Heap will think that those 1 KB already went away.

This was causing us to underestimate heap size, which affects collection scheduling.

• heap/SlotVisitor.h:

(JSC::SlotVisitor::reportMemoryVisited):

• heap/WeakBlock.cpp:

(JSC::WeakBlock::visit):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/SlotVisitor.h (modified) (1 diff)
• heap/WeakBlock.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-02-08  Andreas Kling  <akling@apple.com>
+
+        Visiting a WeakBlock should report bytes visited, since we reported them allocated.
+        <https://webkit.org/b/153978>
+
+        Reviewed by Darin Adler.
+
+        When creating a WeakBlock, we tell Heap that we've allocated 1 KB (WeakBlock::blockSize)
+        of memory. Consequently, when visiting a WeakBlock, we should also report 1 KB of memory
+        visited. Otherwise Heap will think that those 1 KB already went away.
+
+        This was causing us to underestimate heap size, which affects collection scheduling.
+
+        * heap/SlotVisitor.h:
+        (JSC::SlotVisitor::reportMemoryVisited):
+        * heap/WeakBlock.cpp:
+        (JSC::WeakBlock::visit):
+
 2016-02-07  Saam barati  <sbarati@apple.com>
 

trunk/Source/JavaScriptCore/heap/SlotVisitor.h

@@ -106 +106 @@
     
     void reportExtraMemoryVisited(size_t);
+    void reportMemoryVisited(size_t bytes) { m_bytesVisited += bytes; }
     
     void addWeakReferenceHarvester(WeakReferenceHarvester*);

trunk/Source/JavaScriptCore/heap/WeakBlock.cpp

@@ -110 +110 @@
     SlotVisitor& visitor = heapRootVisitor.visitor();
 
+    visitor.reportMemoryVisited(WeakBlock::blockSize);
+
     for (size_t i = 0; i < weakImplCount(); ++i) {
         WeakImpl* weakImpl = &weakImpls()[i];