Changeset 167772 in webkit

Timestamp:

Apr 24, 2014 2:12:56 PM (10 years ago)

Author:

mark.lam@apple.com

Message:

Make slowPathAllocsBetweenGCs a runtime option.
<​https://webkit.org/b/132137>

Reviewed by Mark Hahnenberg.

This will make it easier to more casually run tests with this configuration
as well as to reproduce issues (instead of requiring a code mod and rebuild).
We will now take --slowPathAllocsBetweenGCs=N where N is the number of
slow path allocations before we trigger a collection.

The option defaults to 0, which is reserved to mean that we will not trigger
any collections there.

• heap/Heap.h:
• heap/MarkedAllocator.cpp:

(JSC::MarkedAllocator::doTestCollectionsIfNeeded):
(JSC::MarkedAllocator::allocateSlowCase):

• heap/MarkedAllocator.h:
• runtime/Options.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• heap/Heap.h (modified) (1 diff)
• heap/MarkedAllocator.cpp (modified) (1 diff)
• heap/MarkedAllocator.h (modified) (1 diff)
• runtime/Options.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-04-24  Mark Lam  <mark.lam@apple.com>
+
+        Make slowPathAllocsBetweenGCs a runtime option.
+        <https://webkit.org/b/132137>
+
+        Reviewed by Mark Hahnenberg.
+
+        This will make it easier to more casually run tests with this configuration
+        as well as to reproduce issues (instead of requiring a code mod and rebuild).
+        We will now take --slowPathAllocsBetweenGCs=N where N is the number of
+        slow path allocations before we trigger a collection.
+
+        The option defaults to 0, which is reserved to mean that we will not trigger
+        any collections there.
+
+        * heap/Heap.h:
+        * heap/MarkedAllocator.cpp:
+        (JSC::MarkedAllocator::doTestCollectionsIfNeeded):
+        (JSC::MarkedAllocator::allocateSlowCase):
+        * heap/MarkedAllocator.h:
+        * runtime/Options.h:
+
 2014-04-23  Mark Lam  <mark.lam@apple.com>
 

trunk/Source/JavaScriptCore/heap/Heap.h

@@ -45 +45 @@
 #include <wtf/HashCountedSet.h>
 #include <wtf/HashSet.h>
-
-#define COLLECT_ON_EVERY_ALLOCATION 0
 
 namespace JSC {

trunk/Source/JavaScriptCore/heap/MarkedAllocator.cpp

@@ -144 +144 @@
     return result;
 }
-    
+
+ALWAYS_INLINE void MarkedAllocator::doTestCollectionsIfNeeded()
+{
+    if (!Options::slowPathAllocsBetweenGCs())
+        return;
+
+    static unsigned allocationCount = 0;
+    if (!allocationCount) {
+        if (!m_heap->isDeferred())
+            m_heap->collectAllGarbage();
+        ASSERT(m_heap->m_operationInProgress == NoOperation);
+    }
+    if (++allocationCount >= Options::slowPathAllocsBetweenGCs())
+        allocationCount = 0;
+}
+
 void* MarkedAllocator::allocateSlowCase(size_t bytes)
 {
     ASSERT(m_heap->vm()->currentThreadIsHoldingAPILock());
-#if COLLECT_ON_EVERY_ALLOCATION
-    if (!m_heap->isDeferred())
-        m_heap->collectAllGarbage();
-    ASSERT(m_heap->m_operationInProgress == NoOperation);
-#endif
-    
+    doTestCollectionsIfNeeded();
+
     ASSERT(!m_markedSpace->isIterating());
     ASSERT(!m_freeList.head);

trunk/Source/JavaScriptCore/heap/MarkedAllocator.h

@@ -51 +51 @@
     void* tryPopFreeList(size_t);
     MarkedBlock* allocateBlock(size_t);
+    ALWAYS_INLINE void doTestCollectionsIfNeeded();
     
     MarkedBlock::FreeList m_freeList;

trunk/Source/JavaScriptCore/runtime/Options.h

@@ -251 +251 @@
     v(double, minCopiedBlockUtilization, 0.9) \
     v(double, minMarkedBlockUtilization, 0.9) \
+    v(unsigned, slowPathAllocsBetweenGCs, 0) \
     \
     v(double, percentCPUPerMBForFullTimer, 0.0003125) \