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

Timestamp:

Feb 4, 2011, 4:20:16 PM (15 years ago)

Author:

[email protected]

Message:

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

Reviewed by Oliver Hunt.

Rolled back in r77612 with ASSERT/crash fixed.
​https://bugs.webkit.org/show_bug.cgi?id=53759

Don't shrink the heap to 0 unconditionally. Instead, shrink to 1 if
necessary. For now, the heap assumes that it always has at least one
block live.

• runtime/Heap.cpp: (JSC::Heap::Heap): (JSC::Heap::reset):
• runtime/Heap.h:
• runtime/MarkedSpace.cpp: (JSC::MarkedSpace::allocate): (JSC::MarkedSpace::shrinkBlocks): (JSC::MarkedSpace::sweep): (JSC::MarkedSpace::reset):
• runtime/MarkedSpace.h: (JSC::MarkedSpace::highWaterMark): (JSC::MarkedSpace::setHighWaterMark):

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 = static_cast<size_t>(usedCellCount * 1.5 * HeapConstants::cellSize);
+    m_markedSpace.setHighWaterMark(max(proportionalBytes, minBytesPerCycle));
+
     JAVASCRIPTCORE_GC_END();