<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[191244] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/191244">191244</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-17 11:42:52 -0700 (Sat, 17 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/191240">r191240</a>.
https://bugs.webkit.org/show_bug.cgi?id=150281
Broke 32-bit builds (Requested by smfr on #webkit).
Reverted changeset:
"Fix some generational heap growth pathologies"
https://bugs.webkit.org/show_bug.cgi?id=150270
http://trac.webkit.org/changeset/191240</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedBlockh">trunk/Source/JavaScriptCore/heap/CopiedBlock.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedSpaceInlinesh">trunk/Source/JavaScriptCore/heap/CopiedSpaceInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapInlinesh">trunk/Source/JavaScriptCore/heap/HeapInlines.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapMarkedBlockcpp">trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreheapCopiedBlockcpp">trunk/Source/JavaScriptCore/heap/CopiedBlock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -288,7 +288,6 @@
</span><span class="cx">
</span><span class="cx"> heap/CodeBlockSet.cpp
</span><span class="cx"> heap/ConservativeRoots.cpp
</span><del>- heap/CopiedBlock.cpp
</del><span class="cx"> heap/CopiedSpace.cpp
</span><span class="cx"> heap/CopyVisitor.cpp
</span><span class="cx"> heap/DeferGC.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-10-17 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r191240.
+ https://bugs.webkit.org/show_bug.cgi?id=150281
+
+ Broke 32-bit builds (Requested by smfr on #webkit).
+
+ Reverted changeset:
+
+ "Fix some generational heap growth pathologies"
+ https://bugs.webkit.org/show_bug.cgi?id=150270
+ http://trac.webkit.org/changeset/191240
+
</ins><span class="cx"> 2015-10-17 Sungmann Cho <sungmann.cho@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [Win] Fix the Windows build.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -514,7 +514,6 @@
</span><span class="cx"> 0FB7F39C15ED8E4600F167B2 /* PropertyStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB7F39015ED8E3800F167B2 /* PropertyStorage.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FB7F39D15ED8E4600F167B2 /* Reject.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB7F39115ED8E3800F167B2 /* Reject.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FB7F39E15ED8E4600F167B2 /* SparseArrayValueMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FB7F39215ED8E3800F167B2 /* SparseArrayValueMap.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 0FBADF541BD1F4B800E073C1 /* CopiedBlock.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FBADF531BD1F4B800E073C1 /* CopiedBlock.cpp */; };
</del><span class="cx"> 0FBC0AE71496C7C400D4FBDD /* DFGExitProfile.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FBC0AE41496C7C100D4FBDD /* DFGExitProfile.cpp */; };
</span><span class="cx"> 0FBC0AE81496C7C700D4FBDD /* DFGExitProfile.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FBC0AE51496C7C100D4FBDD /* DFGExitProfile.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 0FBD7E691447999600481315 /* CodeOrigin.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FBD7E671447998F00481315 /* CodeOrigin.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -2378,7 +2377,6 @@
</span><span class="cx"> 0FB7F39015ED8E3800F167B2 /* PropertyStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PropertyStorage.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FB7F39115ED8E3800F167B2 /* Reject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Reject.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FB7F39215ED8E3800F167B2 /* SparseArrayValueMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SparseArrayValueMap.h; sourceTree = "<group>"; };
</span><del>- 0FBADF531BD1F4B800E073C1 /* CopiedBlock.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CopiedBlock.cpp; sourceTree = "<group>"; };
</del><span class="cx"> 0FBC0AE41496C7C100D4FBDD /* DFGExitProfile.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DFGExitProfile.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 0FBC0AE51496C7C100D4FBDD /* DFGExitProfile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DFGExitProfile.h; sourceTree = "<group>"; };
</span><span class="cx"> 0FBD7E671447998F00481315 /* CodeOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CodeOrigin.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -4246,7 +4244,6 @@
</span><span class="cx"> 146B14DB12EB5B12001BEC1B /* ConservativeRoots.cpp */,
</span><span class="cx"> 149DAAF212EB559D0083B12B /* ConservativeRoots.h */,
</span><span class="cx"> C2EAD2FB14F0249800A4B159 /* CopiedAllocator.h */,
</span><del>- 0FBADF531BD1F4B800E073C1 /* CopiedBlock.cpp */,
</del><span class="cx"> C2C8D02E14A3CEFC00578E65 /* CopiedBlock.h */,
</span><span class="cx"> C2FC9BD216644DFB00810D33 /* CopiedBlockInlines.h */,
</span><span class="cx"> C240305314B404C90079EB64 /* CopiedSpace.cpp */,
</span><span class="lines">@@ -7831,7 +7828,6 @@
</span><span class="cx"> 0F24E54C17EE274900ABB217 /* JITOperations.cpp in Sources */,
</span><span class="cx"> 86CC85C40EE7A89400288682 /* JITPropertyAccess.cpp in Sources */,
</span><span class="cx"> A7C1E8E4112E72EF00A37F98 /* JITPropertyAccess32_64.cpp in Sources */,
</span><del>- 0FBADF541BD1F4B800E073C1 /* CopiedBlock.cpp in Sources */,
</del><span class="cx"> 0F766D2815A8CC1E008F363E /* JITStubRoutine.cpp in Sources */,
</span><span class="cx"> 0F766D2B15A8CC38008F363E /* JITStubRoutineSet.cpp in Sources */,
</span><span class="cx"> 0F5EF91E16878F7A003E5C25 /* JITThunks.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedBlockcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/heap/CopiedBlock.cpp (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedBlock.cpp 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/heap/CopiedBlock.cpp 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -1,90 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "CopiedBlock.h"
-
-#include <wtf/DataLog.h>
-
-namespace JSC {
-
-static const bool computeBalance = false;
-static size_t balance;
-
-CopiedBlock* CopiedBlock::createNoZeroFill(size_t capacity)
-{
- if (computeBalance) {
- balance++;
- if (!(balance % 10))
- dataLog("CopiedBlock Balance: ", balance, "\n");
- }
- return new(NotNull, fastAlignedMalloc(CopiedBlock::blockSize, capacity)) CopiedBlock(capacity);
-}
-
-void CopiedBlock::destroy(CopiedBlock* copiedBlock)
-{
- if (computeBalance) {
- balance--;
- if (!(balance % 10))
- dataLog("CopiedBlock Balance: ", balance, "\n");
- }
- copiedBlock->~CopiedBlock();
- fastAlignedFree(copiedBlock);
-}
-
-CopiedBlock* CopiedBlock::create(size_t capacity)
-{
- CopiedBlock* newBlock = createNoZeroFill(capacity);
- newBlock->zeroFillWilderness();
- return newBlock;
-}
-
-void CopiedBlock::zeroFillWilderness()
-{
-#if USE(JSVALUE64)
- memset(wilderness(), 0, wildernessSize());
-#else
- JSValue emptyValue;
- JSValue* limit = reinterpret_cast_ptr<JSValue*>(wildernessEnd());
- for (JSValue* currentValue = reinterpret_cast_ptr<JSValue*>(wilderness()); currentValue < limit; currentValue++)
- *currentValue = emptyValue;
-#endif
-}
-
-CopiedBlock::CopiedBlock(size_t capacity)
- : DoublyLinkedListNode<CopiedBlock>()
- , m_capacity(capacity)
- , m_remaining(payloadCapacity())
- , m_isPinned(false)
- , m_isOld(false)
- , m_liveBytes(0)
-#ifndef NDEBUG
- , m_liveObjects(0)
-#endif
-{
- ASSERT(is8ByteAligned(reinterpret_cast<void*>(m_remaining)));
-}
-
-} // namespace JSC
</del></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedBlockh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedBlock.h (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedBlock.h 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/heap/CopiedBlock.h 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -108,6 +108,50 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline CopiedBlock* CopiedBlock::createNoZeroFill(size_t capacity)
+{
+ return new(NotNull, fastAlignedMalloc(CopiedBlock::blockSize, capacity)) CopiedBlock(capacity);
+}
+
+inline void CopiedBlock::destroy(CopiedBlock* copiedBlock)
+{
+ copiedBlock->~CopiedBlock();
+ fastAlignedFree(copiedBlock);
+}
+
+inline CopiedBlock* CopiedBlock::create(size_t capacity)
+{
+ CopiedBlock* newBlock = createNoZeroFill(capacity);
+ newBlock->zeroFillWilderness();
+ return newBlock;
+}
+
+inline void CopiedBlock::zeroFillWilderness()
+{
+#if USE(JSVALUE64)
+ memset(wilderness(), 0, wildernessSize());
+#else
+ JSValue emptyValue;
+ JSValue* limit = reinterpret_cast_ptr<JSValue*>(wildernessEnd());
+ for (JSValue* currentValue = reinterpret_cast_ptr<JSValue*>(wilderness()); currentValue < limit; currentValue++)
+ *currentValue = emptyValue;
+#endif
+}
+
+inline CopiedBlock::CopiedBlock(size_t capacity)
+ : DoublyLinkedListNode<CopiedBlock>()
+ , m_capacity(capacity)
+ , m_remaining(payloadCapacity())
+ , m_isPinned(false)
+ , m_isOld(false)
+ , m_liveBytes(0)
+#ifndef NDEBUG
+ , m_liveObjects(0)
+#endif
+{
+ ASSERT(is8ByteAligned(reinterpret_cast<void*>(m_remaining)));
+}
+
</ins><span class="cx"> inline void CopiedBlock::didSurviveGC()
</span><span class="cx"> {
</span><span class="cx"> checkConsistency();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapCopiedSpaceInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/CopiedSpaceInlines.h (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/CopiedSpaceInlines.h 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/heap/CopiedSpaceInlines.h 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -237,8 +237,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> double markedSpaceBytes = m_heap->objectSpace().capacity();
</span><del>- double totalUtilization = static_cast<double>(totalLiveBytes + markedSpaceBytes) / static_cast<double>(totalUsableBytes + markedSpaceBytes);
- m_shouldDoCopyPhase = m_heap->operationInProgress() == EdenCollection || totalUtilization <= Options::minHeapUtilization();
</del><ins>+ double totalFragmentation = static_cast<double>(totalLiveBytes + markedSpaceBytes) / static_cast<double>(totalUsableBytes + markedSpaceBytes);
+ m_shouldDoCopyPhase = m_heap->operationInProgress() == EdenCollection || totalFragmentation <= Options::minHeapUtilization();
</ins><span class="cx"> if (!m_shouldDoCopyPhase) {
</span><span class="cx"> if (Options::logGC())
</span><span class="cx"> dataLog("Skipped copying, ");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -864,12 +864,11 @@
</span><span class="cx"> m_totalBytesCopied = 0;
</span><span class="cx"> } else
</span><span class="cx"> m_totalBytesCopied -= bytesRemovedFromOldSpaceDueToReallocation;
</span><del>-
- m_totalBytesVisitedThisCycle = m_slotVisitor.bytesVisited() + threadBytesVisited();
- m_totalBytesCopiedThisCycle = m_slotVisitor.bytesCopied() + threadBytesCopied();
</del><span class="cx">
</span><del>- m_totalBytesVisited += m_totalBytesVisitedThisCycle;
- m_totalBytesCopied += m_totalBytesCopiedThisCycle;
</del><ins>+ m_totalBytesVisited += m_slotVisitor.bytesVisited();
+ m_totalBytesCopied += m_slotVisitor.bytesCopied();
+ m_totalBytesVisited += threadBytesVisited();
+ m_totalBytesCopied += threadBytesCopied();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Heap::resetVisitors()
</span><span class="lines">@@ -903,6 +902,16 @@
</span><span class="cx"> return m_objectSpace.capacity() + m_storageSpace.capacity() + extraMemorySize();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+size_t Heap::sizeAfterCollect()
+{
+ // The result here may not agree with the normal Heap::size().
+ // This is due to the fact that we only count live copied bytes
+ // rather than all used (including dead) copied bytes, thus it's
+ // always the case that m_totalBytesCopied <= m_storageSpace.size().
+ ASSERT(m_totalBytesCopied <= m_storageSpace.size());
+ return m_totalBytesVisited + m_totalBytesCopied + extraMemorySize();
+}
+
</ins><span class="cx"> size_t Heap::protectedGlobalObjectCount()
</span><span class="cx"> {
</span><span class="cx"> return forEachProtectedCell<CountIfGlobalObject>();
</span><span class="lines">@@ -1034,7 +1043,7 @@
</span><span class="cx">
</span><span class="cx"> double before = 0;
</span><span class="cx"> if (Options::logGC()) {
</span><del>- dataLog("[GC: ", capacity() / 1024, " kb ");
</del><ins>+ dataLog("[GC: ");
</ins><span class="cx"> before = currentTimeMS();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1128,10 +1137,6 @@
</span><span class="cx"> void Heap::willStartCollection(HeapOperation collectionType)
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(StartingCollection);
</span><del>-
- if (Options::logGC())
- dataLog("=> ");
-
</del><span class="cx"> if (shouldDoFullCollection(collectionType)) {
</span><span class="cx"> m_operationInProgress = FullCollection;
</span><span class="cx"> m_shouldDoFullCollection = false;
</span><span class="lines">@@ -1268,42 +1273,7 @@
</span><span class="cx"> void Heap::updateAllocationLimits()
</span><span class="cx"> {
</span><span class="cx"> GCPHASE(UpdateAllocationLimits);
</span><del>-
- // Calculate our current heap size threshold for the purpose of figuring out when we should
- // run another collection. This isn't the same as either size() or capacity(), though it should
- // be somewhere between the two. The key is to match the size calculations involved calls to
- // didAllocate(), while never dangerously underestimating capacity(). In extreme cases of
- // fragmentation, we may have size() much smaller than capacity(). Our collector sometimes
- // temporarily allows very high fragmentation because it doesn't defragment old blocks in copied
- // space.
- size_t currentHeapSize = 0;
-
- // For marked space, we use the total number of bytes visited. This matches the logic for
- // MarkedAllocator's calls to didAllocate(), which effectively accounts for the total size of
- // objects allocated rather than blocks used. This will underestimate capacity(), and in case
- // of fragmentation, this may be substantial. Fortunately, marked space rarely fragments because
- // cells usually have a narrow range of sizes. So, the underestimation is probably OK.
- currentHeapSize += m_totalBytesVisited;
-
- // For copied space, we use the capacity of storage space. This is because copied space may get
- // badly fragmented between full collections. This arises when each eden collection evacuates
- // much less than one CopiedBlock's worth of stuff. It can also happen when CopiedBlocks get
- // pinned due to very short-lived objects. In such a case, we want to get to a full collection
- // sooner rather than later. If we used m_totalBytesCopied, then for for each CopiedBlock that an
- // eden allocation promoted, we would only deduct the one object's size from eden size. This
- // would mean that we could "leak" many CopiedBlocks before we did a full collection and
- // defragmented all of them. It would be great to use m_totalBytesCopied, but we'd need to
- // augment it with something that accounts for those fragmented blocks.
- // FIXME: Make it possible to compute heap size using m_totalBytesCopied rather than
- // m_storageSpace.capacity()
- // https://bugs.webkit.org/show_bug.cgi?id=150268
- ASSERT(m_totalBytesCopied <= m_storageSpace.size());
- currentHeapSize += m_storageSpace.capacity();
-
- // It's up to the user to ensure that extraMemorySize() ends up corresponding to allocation-time
- // extra memory reporting.
- currentHeapSize += extraMemorySize();
-
</del><ins>+ size_t currentHeapSize = sizeAfterCollect();
</ins><span class="cx"> if (Options::gcMaxHeapSize() && currentHeapSize > Options::gcMaxHeapSize())
</span><span class="cx"> HeapStatistics::exitWithFailure();
</span><span class="cx">
</span><span class="lines">@@ -1316,23 +1286,13 @@
</span><span class="cx"> m_sizeAfterLastFullCollect = currentHeapSize;
</span><span class="cx"> m_bytesAbandonedSinceLastFullCollect = 0;
</span><span class="cx"> } else {
</span><del>- static const bool verbose = false;
-
</del><span class="cx"> ASSERT(currentHeapSize >= m_sizeAfterLastCollect);
</span><span class="cx"> m_maxEdenSize = m_maxHeapSize - currentHeapSize;
</span><span class="cx"> m_sizeAfterLastEdenCollect = currentHeapSize;
</span><del>- if (verbose) {
- dataLog("Max heap size: ", m_maxHeapSize, "\n");
- dataLog("Current heap size: ", currentHeapSize, "\n");
- dataLog("Size after last eden collection: ", m_sizeAfterLastEdenCollect, "\n");
- }
</del><span class="cx"> double edenToOldGenerationRatio = (double)m_maxEdenSize / (double)m_maxHeapSize;
</span><del>- if (verbose)
- dataLog("Eden to old generation ratio: ", edenToOldGenerationRatio, "\n");
</del><span class="cx"> double minEdenToOldGenerationRatio = 1.0 / 3.0;
</span><span class="cx"> if (edenToOldGenerationRatio < minEdenToOldGenerationRatio)
</span><span class="cx"> m_shouldDoFullCollection = true;
</span><del>- // This seems suspect at first, but what it does is ensure that the nursery size is fixed.
</del><span class="cx"> m_maxHeapSize += currentHeapSize - m_sizeAfterLastCollect;
</span><span class="cx"> m_maxEdenSize = m_maxHeapSize - currentHeapSize;
</span><span class="cx"> if (m_fullActivityCallback) {
</span><span class="lines">@@ -1345,7 +1305,7 @@
</span><span class="cx"> m_bytesAllocatedThisCycle = 0;
</span><span class="cx">
</span><span class="cx"> if (Options::logGC())
</span><del>- dataLog(currentHeapSize / 1024, " kb ");
</del><ins>+ dataLog(currentHeapSize / 1024, " kb, ");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Heap::didFinishCollection(double gcStartTime)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -330,6 +330,7 @@
</span><span class="cx"> bool sweepNextLogicallyEmptyWeakBlock();
</span><span class="cx">
</span><span class="cx"> bool shouldDoFullCollection(HeapOperation requestedCollectionType) const;
</span><ins>+ size_t sizeAfterCollect();
</ins><span class="cx">
</span><span class="cx"> JSStack& stack();
</span><span class="cx">
</span><span class="lines">@@ -356,9 +357,7 @@
</span><span class="cx"> size_t m_maxHeapSize;
</span><span class="cx"> bool m_shouldDoFullCollection;
</span><span class="cx"> size_t m_totalBytesVisited;
</span><del>- size_t m_totalBytesVisitedThisCycle;
</del><span class="cx"> size_t m_totalBytesCopied;
</span><del>- size_t m_totalBytesCopiedThisCycle;
</del><span class="cx">
</span><span class="cx"> HeapOperation m_operationInProgress;
</span><span class="cx"> StructureIDTable m_structureIDTable;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapInlinesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/HeapInlines.h (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/HeapInlines.h 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/heap/HeapInlines.h 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -39,13 +39,9 @@
</span><span class="cx"> {
</span><span class="cx"> if (isDeferred())
</span><span class="cx"> return false;
</span><del>- if (!m_isSafeToCollect)
- return false;
- if (m_operationInProgress != NoOperation)
- return false;
</del><span class="cx"> if (Options::gcMaxHeapSize())
</span><del>- return m_bytesAllocatedThisCycle > Options::gcMaxHeapSize();
- return m_bytesAllocatedThisCycle > m_maxEdenSize;
</del><ins>+ return m_bytesAllocatedThisCycle > Options::gcMaxHeapSize() && m_isSafeToCollect && m_operationInProgress == NoOperation;
+ return m_bytesAllocatedThisCycle > m_maxEdenSize && m_isSafeToCollect && m_operationInProgress == NoOperation;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline bool Heap::isBusy()
</span><span class="lines">@@ -278,6 +274,9 @@
</span><span class="cx">
</span><span class="cx"> inline bool Heap::collectIfNecessaryOrDefer()
</span><span class="cx"> {
</span><ins>+ if (isDeferred())
+ return false;
+
</ins><span class="cx"> if (!shouldCollect())
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapMarkedBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp (191243 => 191244)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-10-17 18:34:19 UTC (rev 191243)
+++ trunk/Source/JavaScriptCore/heap/MarkedBlock.cpp 2015-10-17 18:42:52 UTC (rev 191244)
</span><span class="lines">@@ -32,26 +32,13 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static const bool computeBalance = false;
-static size_t balance;
-
</del><span class="cx"> MarkedBlock* MarkedBlock::create(MarkedAllocator* allocator, size_t capacity, size_t cellSize, bool needsDestruction)
</span><span class="cx"> {
</span><del>- if (computeBalance) {
- balance++;
- if (!(balance % 10))
- dataLog("MarkedBlock Balance: ", balance, "\n");
- }
</del><span class="cx"> return new (NotNull, fastAlignedMalloc(blockSize, capacity)) MarkedBlock(allocator, capacity, cellSize, needsDestruction);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MarkedBlock::destroy(MarkedBlock* block)
</span><span class="cx"> {
</span><del>- if (computeBalance) {
- balance--;
- if (!(balance % 10))
- dataLog("MarkedBlock Balance: ", balance, "\n");
- }
</del><span class="cx"> block->~MarkedBlock();
</span><span class="cx"> fastAlignedFree(block);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>