Changeset 157537 in webkit for trunk/Source/JavaScriptCore/heap/HeapTimer.cpp

Timestamp:

Oct 16, 2013, 4:36:25 PM (12 years ago)

Author:

[email protected]

Message:

Add SPI to disable the garbage collector timer
​https://bugs.webkit.org/show_bug.cgi?id=122921

Reviewed by Geoffrey Garen.

Based on a patch by Mark Hahnenberg.

• API/JSBase.cpp:

(JSDisableGCTimer): Added; SPI function.

• API/JSBasePrivate.h:
• heap/BlockAllocator.cpp:

(JSC::createBlockFreeingThread): Added.
(JSC::BlockAllocator::BlockAllocator): Modified to use JSC::createBlockFreeingThread()
to conditionally create the "block freeing" thread depending on the value of
GCActivityCallback::s_shouldCreateGCTimer.
(JSC::BlockAllocator::~BlockAllocator):

• heap/BlockAllocator.h:

(JSC::BlockAllocator::deallocate):

• heap/Heap.cpp:

(JSC::Heap::didAbandon):
(JSC::Heap::collect):
(JSC::Heap::didAllocate):

• heap/HeapTimer.cpp:

(JSC::HeapTimer::timerDidFire):

• runtime/GCActivityCallback.cpp:
• runtime/GCActivityCallback.h:

(JSC::DefaultGCActivityCallback::create): Only instantiate a DefaultGCActivityCallback object
when GCActivityCallback::s_shouldCreateGCTimer is true so as to prevent allocating a HeapTimer
object (since DefaultGCActivityCallback ultimately extends HeapTimer).

File:

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

trunk/Source/JavaScriptCore/heap/HeapTimer.cpp

@@ -86 +86 @@
 
     HeapTimer* heapTimer = 0;
-    if (vm->heap.activityCallback()->m_timer.get() == timer)
+    if (vm->heap.activityCallback() && vm->heap.activityCallback()->m_timer.get() == timer)
         heapTimer = vm->heap.activityCallback();
     else if (vm->heap.sweeper()->m_timer.get() == timer)