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

Timestamp:

Feb 4, 2011, 5:03:21 AM (14 years ago)

Author:

[email protected]

Message:

2011-02-04 Ilya Tikhonovsky <​[email protected]>

Unreviewed rollout two patches r77614 and r77612.

REGRESSION: Snow Leopard Intell Release anumber of failing tests.

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

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_operationInProgress(NoOperation)
-    , m_markedSpace(globalData)
+    : m_markedSpace(globalData)
+    , m_operationInProgress(NoOperation)
     , m_markListSet(0)
     , m_activityCallback(DefaultGCActivityCallback::create(this))
@@ -387 +382 @@
         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();