<!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>[202827] 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/202827">202827</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-07-05 12:49:19 -0700 (Tue, 05 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>reportAbandonedObjectGraph should report abandoned bytes based on capacity() so it works even if a GC has never happened
https://bugs.webkit.org/show_bug.cgi?id=159222
<rdar://problem/27001991>
Reviewed by Geoffrey Garen.
When reportAbandonedObjectGraph() was called before the first GC, it used to
not indicate to the GC timers that we have memory that needs to be collected
because the calculation was based on m_sizeAfterLastCollect (which was zero).
This patch makes the calculation based on capacity() which is a valid number
even before the first GC.
* heap/Heap.cpp:
(JSC::Heap::reportAbandonedObjectGraph):
(JSC::Heap::protect):
(JSC::Heap::didAbandon): Deleted.
* heap/Heap.h:
(JSC::Heap::jitStubRoutines):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (202826 => 202827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-07-05 18:59:05 UTC (rev 202826)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-07-05 19:49:19 UTC (rev 202827)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-07-05 Saam Barati <sbarati@apple.com>
+
+ reportAbandonedObjectGraph should report abandoned bytes based on capacity() so it works even if a GC has never happened
+ https://bugs.webkit.org/show_bug.cgi?id=159222
+ <rdar://problem/27001991>
+
+ Reviewed by Geoffrey Garen.
+
+ When reportAbandonedObjectGraph() was called before the first GC, it used to
+ not indicate to the GC timers that we have memory that needs to be collected
+ because the calculation was based on m_sizeAfterLastCollect (which was zero).
+ This patch makes the calculation based on capacity() which is a valid number
+ even before the first GC.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::reportAbandonedObjectGraph):
+ (JSC::Heap::protect):
+ (JSC::Heap::didAbandon): Deleted.
+ * heap/Heap.h:
+ (JSC::Heap::jitStubRoutines):
+
</ins><span class="cx"> 2016-07-05 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Typo fix after r202214
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (202826 => 202827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-07-05 18:59:05 UTC (rev 202826)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2016-07-05 19:49:19 UTC (rev 202827)
</span><span class="lines">@@ -432,22 +432,17 @@
</span><span class="cx"> {
</span><span class="cx"> // Our clients don't know exactly how much memory they
</span><span class="cx"> // are abandoning so we just guess for them.
</span><del>- double abandonedBytes = 0.1 * m_sizeAfterLastCollect;
</del><ins>+ size_t abandonedBytes = static_cast<size_t>(0.1 * capacity());
</ins><span class="cx">
</span><span class="cx"> // We want to accelerate the next collection. Because memory has just
</span><span class="cx"> // been abandoned, the next collection has the potential to
</span><span class="cx"> // be more profitable. Since allocation is the trigger for collection,
</span><span class="cx"> // we hasten the next collection by pretending that we've allocated more memory.
</span><del>- didAbandon(abandonedBytes);
-}
-
-void Heap::didAbandon(size_t bytes)
-{
</del><span class="cx"> if (m_fullActivityCallback) {
</span><span class="cx"> m_fullActivityCallback->didAllocate(
</span><span class="cx"> m_sizeAfterLastCollect - m_sizeAfterLastFullCollect + m_bytesAllocatedThisCycle + m_bytesAbandonedSinceLastFullCollect);
</span><span class="cx"> }
</span><del>- m_bytesAbandonedSinceLastFullCollect += bytes;
</del><ins>+ m_bytesAbandonedSinceLastFullCollect += abandonedBytes;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Heap::protect(JSValue k)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (202826 => 202827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2016-07-05 18:59:05 UTC (rev 202826)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2016-07-05 19:49:19 UTC (rev 202827)
</span><span class="lines">@@ -229,8 +229,6 @@
</span><span class="cx"> void deleteAllUnlinkedCodeBlocks();
</span><span class="cx">
</span><span class="cx"> void didAllocate(size_t);
</span><del>- void didAbandon(size_t);
-
</del><span class="cx"> bool isPagedOut(double deadline);
</span><span class="cx">
</span><span class="cx"> const JITStubRoutineSet& jitStubRoutines() { return m_jitStubRoutines; }
</span></span></pre>
</div>
</div>
</body>
</html>