diff options
Diffstat (limited to 'Source/JavaScriptCore/heap/Heap.cpp')
| -rw-r--r-- | Source/JavaScriptCore/heap/Heap.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp index 9b68fb10a..90c4bb72c 100644 --- a/Source/JavaScriptCore/heap/Heap.cpp +++ b/Source/JavaScriptCore/heap/Heap.cpp @@ -27,6 +27,7 @@ #include "ConservativeRoots.h" #include "GCActivityCallback.h" #include "HeapRootVisitor.h" +#include "IncrementalSweeper.h" #include "Interpreter.h" #include "JSGlobalData.h" #include "JSGlobalObject.h" @@ -245,6 +246,7 @@ Heap::Heap(JSGlobalData* globalData, HeapType heapType) , m_objectSpace(this) , m_storageSpace(this) , m_activityCallback(DefaultGCActivityCallback::create(this)) + , m_sweeper(IncrementalSweeper::create(this)) , m_machineThreads(this) , m_sharedData(globalData) , m_slotVisitor(m_sharedData) @@ -703,9 +705,11 @@ void Heap::collect(SweepToggle sweepToggle) GCPHASE(Sweeping); m_objectSpace.sweep(); m_objectSpace.shrink(); - m_bytesAbandoned = 0; } + m_sweeper->startSweeping(m_objectSpace.blocks().set()); + m_bytesAbandoned = 0; + { GCPHASE(ResetAllocators); m_objectSpace.resetAllocators(); @@ -737,6 +741,11 @@ GCActivityCallback* Heap::activityCallback() return m_activityCallback.get(); } +IncrementalSweeper* Heap::sweeper() +{ + return m_sweeper.get(); +} + void Heap::setGarbageCollectionTimerEnabled(bool enable) { activityCallback()->setEnabled(enable); |