<!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>[207252] branches/safari-602.2.14.0-branch/Source/bmalloc</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/207252">207252</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-12 16:01:50 -0700 (Wed, 12 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/204091">r204091</a>. rdar://problem/28476960</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6022140branchSourcebmallocChangeLog">branches/safari-602.2.14.0-branch/Source/bmalloc/ChangeLog</a></li>
<li><a href="#branchessafari6022140branchSourcebmallocbmallocHeapcpp">branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/Heap.cpp</a></li>
<li><a href="#branchessafari6022140branchSourcebmallocbmallocXLargeMapcpp">branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.cpp</a></li>
<li><a href="#branchessafari6022140branchSourcebmallocbmallocXLargeMaph">branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6022140branchSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/bmalloc/ChangeLog (207251 => 207252)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/bmalloc/ChangeLog 2016-10-12 23:01:48 UTC (rev 207251)
+++ branches/safari-602.2.14.0-branch/Source/bmalloc/ChangeLog 2016-10-12 23:01:50 UTC (rev 207252)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-10-12 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r204091. rdar://problem/28476960
+
+ 2016-08-03 Geoffrey Garen <ggaren@apple.com>
+
+ [bmalloc] Merging of XLargeRanges can leak the upper range
+ https://bugs.webkit.org/show_bug.cgi?id=160403
+
+ Reviewed by Michael Saboff.
+
+ * bmalloc/Heap.cpp:
+ (bmalloc::Heap::scavengeLargeObjects): Don't use removePhysical().
+ Recorded physical size is a performance optimization. It is not the
+ truth. So it might be zero even if a range contains physical pages.
+
+ Instead, iterate each range in the map unconditionally.
+
+ The map can shrink when we release the lock, so we must clamp our
+ iterator each time through the loop.
+
+ The map can grow when we release the lock, but we don't care because
+ growth restarts the scavenger from the beginning.
+
+ * bmalloc/XLargeMap.cpp:
+ (bmalloc::XLargeMap::removePhysical): Deleted. Not used anymore.
+
+ * bmalloc/XLargeMap.h:
+ (bmalloc::XLargeMap::ranges): Added direct access for the sake of
+ scavengeLargeObjects. (This violates our naming conventions -- I'll do
+ a rename in a follow-up patch.)
+
</ins><span class="cx"> 2016-07-13 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Update supported platforms in xcconfig files to match the sdk names.
</span></span></pre></div>
<a id="branchessafari6022140branchSourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/Heap.cpp (207251 => 207252)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/Heap.cpp 2016-10-12 23:01:48 UTC (rev 207251)
+++ branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/Heap.cpp 2016-10-12 23:01:50 UTC (rev 207252)
</span><span class="lines">@@ -131,13 +131,16 @@
</span><span class="cx">
</span><span class="cx"> void Heap::scavengeLargeObjects(std::unique_lock<StaticMutex>& lock, std::chrono::milliseconds sleepDuration)
</span><span class="cx"> {
</span><del>- while (XLargeRange range = m_largeFree.removePhysical()) {
</del><ins>+ auto& ranges = m_largeFree.ranges();
+ for (size_t i = ranges.size(); i-- > 0; i = std::min(i, ranges.size())) {
+ auto range = ranges.pop(i);
+
</ins><span class="cx"> lock.unlock();
</span><span class="cx"> vmDeallocatePhysicalPagesSloppy(range.begin(), range.size());
</span><span class="cx"> lock.lock();
</span><del>-
</del><ins>+
</ins><span class="cx"> range.setPhysicalSize(0);
</span><del>- m_largeFree.add(range);
</del><ins>+ ranges.push(range);
</ins><span class="cx">
</span><span class="cx"> waitUntilFalse(lock, sleepDuration, m_isAllocatingPages);
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari6022140branchSourcebmallocbmallocXLargeMapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.cpp (207251 => 207252)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.cpp 2016-10-12 23:01:48 UTC (rev 207251)
+++ branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.cpp 2016-10-12 23:01:50 UTC (rev 207252)
</span><span class="lines">@@ -76,16 +76,4 @@
</span><span class="cx"> m_free.push(merged);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-XLargeRange XLargeMap::removePhysical()
-{
- auto it = std::find_if(m_free.begin(), m_free.end(), [](const XLargeRange& range) {
- return range.physicalSize();
- });
-
- if (it == m_free.end())
- return XLargeRange();
-
- return m_free.pop(it);
-}
-
</del><span class="cx"> } // namespace bmalloc
</span></span></pre></div>
<a id="branchessafari6022140branchSourcebmallocbmallocXLargeMaph"></a>
<div class="modfile"><h4>Modified: branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.h (207251 => 207252)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.h 2016-10-12 23:01:48 UTC (rev 207251)
+++ branches/safari-602.2.14.0-branch/Source/bmalloc/bmalloc/XLargeMap.h 2016-10-12 23:01:50 UTC (rev 207252)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> public:
</span><span class="cx"> void add(const XLargeRange&);
</span><span class="cx"> XLargeRange remove(size_t alignment, size_t);
</span><del>- XLargeRange removePhysical();
</del><ins>+ Vector<XLargeRange>& ranges() { return m_free; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Vector<XLargeRange> m_free;
</span></span></pre>
</div>
</div>
</body>
</html>