Changeset 140195 in webkit for trunk/Source/JavaScriptCore/heap/MarkStack.cpp

Timestamp:

Jan 18, 2013, 12:49:58 PM (12 years ago)

Author:

[email protected]

Message:

r134080 causes heap problem on linux systems where PAGESIZE != 4096
​https://bugs.webkit.org/show_bug.cgi?id=102828

Patch by Balazs Kilvady <​[email protected]> on 2013-01-18
Reviewed by Mark Hahnenberg.

Make MarkStackSegment::blockSize as the capacity of segments of a MarkStackArray.

• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCoreExports.def:
• heap/MarkStack.cpp:

(JSC):
(JSC::MarkStackArray::MarkStackArray):
(JSC::MarkStackArray::expand):
(JSC::MarkStackArray::donateSomeCellsTo):
(JSC::MarkStackArray::stealSomeCellsFrom):

• heap/MarkStack.h:

(JSC::MarkStackSegment::data):
(CapacityFromSize):
(MarkStackArray):

• heap/MarkStackInlines.h:

(JSC::MarkStackArray::setTopForFullSegment):
(JSC::MarkStackArray::append):
(JSC::MarkStackArray::isEmpty):
(JSC::MarkStackArray::size):

• runtime/Options.h:

(JSC):

File:

• trunk/Source/JavaScriptCore/heap/MarkStack.cpp (modified) (6 diffs)

trunk/Source/JavaScriptCore/heap/MarkStack.cpp

@@ -32 +32 @@
 #include "CopiedSpaceInlines.h"
 #include "Heap.h"
-#include "Options.h"
 #include "JSArray.h"
 #include "JSCell.h"
@@ -46 +45 @@
 namespace JSC {
 
+COMPILE_ASSERT(MarkStackSegment::blockSize == WeakBlock::blockSize, blockSizeMatch);
+
 MarkStackArray::MarkStackArray(BlockAllocator& blockAllocator)
     : m_blockAllocator(blockAllocator)
-    , m_segmentCapacity(MarkStackSegment::capacityFromSize(Options::gcMarkStackSegmentSize()))
     , m_top(0)
     , m_numberOfSegments(0)
 {
-    ASSERT(MarkStackSegment::blockSize == WeakBlock::blockSize);
     m_segments.push(MarkStackSegment::create(m_blockAllocator.allocate<MarkStackSegment>()));
     m_numberOfSegments++;
@@ -65 +64 @@
 void MarkStackArray::expand()
 {
-    ASSERT(m_segments.head()->m_top == m_segmentCapacity);
+    ASSERT(m_segments.head()->m_top == s_segmentCapacity);
     
     MarkStackSegment* nextSegment = MarkStackSegment::create(m_blockAllocator.allocate<MarkStackSegment>());
@@ -97 +96 @@
     // we prefer donating whole segments over donating individual cells,
     // even if this skews away from our 1 / 2 target.
-
-    ASSERT(m_segmentCapacity == other.m_segmentCapacity);
 
     size_t segmentsToDonate = m_numberOfSegments / 2; // If we only have one segment (our head) we don't donate any segments.
@@ -142 +139 @@
     // individual cells, even if this skews away from our 1 / N target.
 
-    ASSERT(m_segmentCapacity == other.m_segmentCapacity);
     validatePrevious();
     other.validatePrevious();
@@ -152 +148 @@
         MarkStackSegment* myHead = m_segments.removeHead();
 
-        ASSERT(other.m_segments.head()->m_top == m_segmentCapacity);
+        ASSERT(other.m_segments.head()->m_top == s_segmentCapacity);
 
         m_segments.push(other.m_segments.removeHead());