Changeset 155406 in webkit

Timestamp:

Sep 9, 2013, 5:35:19 PM (13 years ago)

Author:

mhahnenberg@apple.com

Message:

CopiedSpace::startedCopying should not call MarkedSpace::capacity
​https://bugs.webkit.org/show_bug.cgi?id=121045

Reviewed by Geoffrey Garen.

MarkedSpace::capacity() iterates every block in MarkedSpace. Instead we should just
keep track of our total capacity in MarkedSpace as we add and remove MarkedBlocks.

• heap/MarkedSpace.cpp:

(JSC::MarkedSpace::freeBlock):

• heap/MarkedSpace.h:

(JSC::MarkedSpace::didAddBlock):
(JSC::MarkedSpace::capacity):

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/MarkedSpace.cpp (modified) (2 diffs)
• heap/MarkedSpace.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-09-09  Mark Hahnenberg  <mhahnenberg@apple.com>
+
+        CopiedSpace::startedCopying should not call MarkedSpace::capacity
+        https://bugs.webkit.org/show_bug.cgi?id=121045
+
+        Reviewed by Geoffrey Garen.
+
+        MarkedSpace::capacity() iterates every block in MarkedSpace. Instead we should just 
+        keep track of our total capacity in MarkedSpace as we add and remove MarkedBlocks.
+
+        * heap/MarkedSpace.cpp:
+        (JSC::MarkedSpace::freeBlock):
+        * heap/MarkedSpace.h:
+        (JSC::MarkedSpace::didAddBlock):
+        (JSC::MarkedSpace::capacity):
+
 2013-09-09  Michael Saboff  <msaboff@apple.com>
 

trunk/Source/JavaScriptCore/heap/MarkedSpace.cpp

@@ -80 +80 @@
 MarkedSpace::MarkedSpace(Heap* heap)
     : m_heap(heap)
+    , m_capacity(0)
 {
     for (size_t cellSize = preciseStep; cellSize <= preciseCutoff; cellSize += preciseStep) {
@@ -196 +197 @@
 {
     block->allocator()->removeBlock(block);
+    m_capacity -= block->capacity();
     m_blocks.remove(block);
     if (block->capacity() == MarkedBlock::blockSize) {

trunk/Source/JavaScriptCore/heap/MarkedSpace.h

@@ -58 +58 @@
 struct Size : MarkedBlock::CountFunctor {
     void operator()(MarkedBlock* block) { count(block->markCount() * block->cellSize()); }
-};
-
-struct Capacity : MarkedBlock::CountFunctor {
-    void operator()(MarkedBlock* block) { count(block->capacity()); }
 };
 
@@ -137 +133 @@
 
     Heap* m_heap;
+    size_t m_capacity;
     MarkedBlockSet m_blocks;
 };
@@ -246 +243 @@
 inline void MarkedSpace::didAddBlock(MarkedBlock* block)
 {
+    m_capacity += block->capacity();
     m_blocks.add(block);
 }
@@ -266 +264 @@
 inline size_t MarkedSpace::capacity()
 {
-    return forEachBlock<Capacity>();
+    return m_capacity;
 }