Changeset 96432 in webkit for trunk/Source/JavaScriptCore/heap/AllocationSpace.cpp

Timestamp:

Sep 30, 2011, 3:23:33 PM (14 years ago)

Author:

[email protected]

Message:

2011-09-30 Oliver Hunt <​[email protected]>

Need a sensible GGC policy

Reviewed by Geoff Garen.

This replaces the existing random collection policy
with a deterministic policy based on nursery size.

• heap/AllocationSpace.cpp: (JSC::AllocationSpace::allocateSlowCase):
• heap/Heap.cpp: (JSC::Heap::Heap): (JSC::Heap::markRoots): (JSC::Heap::collect):
• heap/Heap.h:
• heap/MarkedSpace.cpp: (JSC::MarkedSpace::MarkedSpace): (JSC::MarkedSpace::resetAllocator):
• heap/MarkedSpace.h: (JSC::MarkedSpace::nurseryWaterMark): (JSC::MarkedSpace::allocate):

File:

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

trunk/Source/JavaScriptCore/heap/AllocationSpace.cpp

@@ -56 +56 @@
     AllocationEffort allocationEffort;
     
-    if (m_markedSpace.waterMark() < m_markedSpace.highWaterMark() || !m_heap->m_isSafeToCollect)
+    if ((
+#if ENABLE(GGC)
+         m_markedSpace.nurseryWaterMark() < m_heap->m_minBytesPerCycle
+#else
+         m_markedSpace.waterMark() < m_markedSpace.highWaterMark()
+#endif
+         ) || !m_heap->m_isSafeToCollect)
         allocationEffort = AllocationMustSucceed;
     else