Changeset 77612 in webkit for trunk/Source/JavaScriptCore/runtime/Heap.cpp

Timestamp:

Feb 3, 2011, 11:41:33 PM (14 years ago)

Author:

[email protected]

Message:

2011-02-03 Geoffrey Garen <​[email protected]>

Reviewed by Cameron Zwarich.

Changed MarkedSpace to delegate grow/shrink decisions to Heap
​https://bugs.webkit.org/show_bug.cgi?id=53759

SunSpider reports no change.

• runtime/Heap.cpp: (JSC::Heap::Heap): (JSC::Heap::reset):
• runtime/Heap.h: Reorganized a few data members for better cache locality. Added a grow policy.

• runtime/MarkedSpace.cpp: (JSC::MarkedSpace::allocate): (JSC::MarkedSpace::sweep): (JSC::MarkedSpace::reset): Don't shrink automatically. Instead, wait for the heap to make an explicit sweep call.

• runtime/MarkedSpace.h: (JSC::MarkedSpace::highWaterMark): (JSC::MarkedSpace::setHighWaterMark): Use a watermark to determine how many bytes to allocate before failing and giving the heap an opportunity to collect garbage. This also means that we allocate blocks on demand, instead of ahead of time.

File:

• trunk/Source/JavaScriptCore/runtime/Heap.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/Heap.cpp

@@ -33 +33 @@
 #include "JSONObject.h"
 #include "Tracing.h"
+#include <algorithm>
 
 #define COLLECT_ON_EVERY_ALLOCATION 0
 
+using namespace std;
+
 namespace JSC {
 
+const size_t minBytesPerCycle = 512 * 1024;
+
 Heap::Heap(JSGlobalData* globalData)
-    : m_markedSpace(globalData)
-    , m_operationInProgress(NoOperation)
+    : m_operationInProgress(NoOperation)
+    , m_markedSpace(globalData)
     , m_markListSet(0)
     , m_activityCallback(DefaultGCActivityCallback::create(this))
@@ -382 +387 @@
         m_markedSpace.sweep();
 
+    size_t usedCellCount = m_markedSpace.markedCells();
+    size_t proportionalBytes = usedCellCount * 1.5 * HeapConstants::cellSize;
+    m_markedSpace.setHighWaterMark(max(proportionalBytes, minBytesPerCycle));
+
     JAVASCRIPTCORE_GC_END();