diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/JavaScriptCore/heap/Heap.cpp | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/JavaScriptCore/heap/Heap.cpp')
| -rw-r--r-- | Source/JavaScriptCore/heap/Heap.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/JavaScriptCore/heap/Heap.cpp b/Source/JavaScriptCore/heap/Heap.cpp index 1333c7b2c..a5d4a063f 100644 --- a/Source/JavaScriptCore/heap/Heap.cpp +++ b/Source/JavaScriptCore/heap/Heap.cpp @@ -328,6 +328,7 @@ Heap::Heap(JSGlobalData* globalData, HeapSize heapSize) , m_handleHeap(globalData) , m_isSafeToCollect(false) , m_globalData(globalData) + , m_lastGCLength(0) { (*m_activityCallback)(); m_numberOfFreeBlocks = 0; @@ -781,6 +782,7 @@ void Heap::collect(SweepToggle sweepToggle) ASSERT(globalData()->identifierTable == wtfThreadData().currentIdentifierTable()); ASSERT(m_isSafeToCollect); JAVASCRIPTCORE_GC_BEGIN(); + double lastGCStartTime = WTF::currentTime(); #if ENABLE(GGC) bool fullGC = sweepToggle == DoSweep; if (!fullGC) @@ -835,6 +837,8 @@ void Heap::collect(SweepToggle sweepToggle) m_lastFullGCSize = newSize; setHighWaterMark(max(proportionalBytes, m_minBytesPerCycle)); } + double lastGCEndTime = WTF::currentTime(); + m_lastGCLength = lastGCEndTime - lastGCStartTime; JAVASCRIPTCORE_GC_END(); (*m_activityCallback)(); |