<!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>[196192] tags/Safari-602.1.18.0.2/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/196192">196192</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-02-05 15:16:42 -0800 (Fri, 05 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/196186">r196186</a>. rdar://problem/18620635</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari60211802SourcebmallocChangeLog">tags/Safari-602.1.18.0.2/Source/bmalloc/ChangeLog</a></li>
<li><a href="#tagsSafari60211802SourcebmallocbmallocLargeChunkh">tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/LargeChunk.h</a></li>
<li><a href="#tagsSafari60211802SourcebmallocbmallocSizesh">tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/Sizes.h</a></li>
<li><a href="#tagsSafari60211802SourcebmallocbmallocVMHeapcpp">tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/VMHeap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari60211802SourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.18.0.2/Source/bmalloc/ChangeLog (196191 => 196192)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.18.0.2/Source/bmalloc/ChangeLog 2016-02-05 22:30:04 UTC (rev 196191)
+++ tags/Safari-602.1.18.0.2/Source/bmalloc/ChangeLog 2016-02-05 23:16:42 UTC (rev 196192)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2016-02-05 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r196186.
+
+ 2016-02-05 Saam barati <sbarati@apple.com>
+
+ bmalloc: largeMax calculation is wrong on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=153923
+
+ Reviewed by Mark Lam.
+
+ Our number for largeMax was larger than what we had
+ space to actually allocate inside the LargeChunk. This made
+ it so that we would allocate a large object for something
+ that really should be extra large. Previously:
+ largeMax + sizeof(LargeChunk) > 1MB
+ which meant that when we would grow() to accommodate an allocation
+ of a particular size inside a LargeObject despite the fact that
+ the allocation size would be too large to actually fit in the LargeObject.
+ This would manifest when we had an allocation size in the range:
+ 1MB - sizeof(LargeChunk) < allocation size < largeMax
+
+ We fix this bug by being precise in our calculation of largeMax
+ instead of just assuming largeChunkSize * 99/100 is enough
+ space for the metadata.
+
+ * bmalloc/LargeChunk.h:
+ (bmalloc::LargeChunk::get):
+ * bmalloc/Sizes.h:
+
</ins><span class="cx"> 2015-12-19 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] WebKit contains dead source code for OS X Mavericks and earlier
</span></span></pre></div>
<a id="tagsSafari60211802SourcebmallocbmallocLargeChunkh"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/LargeChunk.h (196191 => 196192)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/LargeChunk.h 2016-02-05 22:30:04 UTC (rev 196191)
+++ tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/LargeChunk.h 2016-02-05 23:16:42 UTC (rev 196192)
</span><span class="lines">@@ -78,6 +78,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+static_assert(largeChunkMetadataSize == sizeof(LargeChunk), "'largeChunkMetadataSize' should be the same number as sizeof(LargeChunk) or our computation in Sizes.h for 'largeMax' is wrong");
+static_assert(largeChunkMetadataSize + largeMax <= largeChunkSize, "We will think we can accommodate larger objects than we can in reality");
+
</ins><span class="cx"> inline LargeChunk* LargeChunk::get(void* object)
</span><span class="cx"> {
</span><span class="cx"> BASSERT(!isSmallOrMedium(object));
</span></span></pre></div>
<a id="tagsSafari60211802SourcebmallocbmallocSizesh"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/Sizes.h (196191 => 196192)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/Sizes.h 2016-02-05 22:30:04 UTC (rev 196191)
+++ tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/Sizes.h 2016-02-05 23:16:42 UTC (rev 196192)
</span><span class="lines">@@ -72,11 +72,16 @@
</span><span class="cx"> static const size_t mediumChunkMask = ~(mediumChunkSize - 1ul);
</span><span class="cx">
</span><span class="cx"> static const size_t largeChunkSize = superChunkSize / 2;
</span><ins>+#if BPLATFORM(IOS)
+ static const size_t largeChunkMetadataSize = 16 * kB;
+#else
+ static const size_t largeChunkMetadataSize = 4 * kB;
+#endif
</ins><span class="cx"> static const size_t largeChunkOffset = 0;
</span><span class="cx"> static const size_t largeChunkMask = ~(largeChunkSize - 1ul);
</span><span class="cx">
</span><span class="cx"> static const size_t largeAlignment = 64;
</span><del>- static const size_t largeMax = largeChunkSize * 99 / 100; // Plenty of room for metadata.
</del><ins>+ static const size_t largeMax = largeChunkSize - largeChunkMetadataSize;
</ins><span class="cx"> static const size_t largeMin = mediumMax;
</span><span class="cx">
</span><span class="cx"> static const size_t xLargeAlignment = vmPageSize;
</span></span></pre></div>
<a id="tagsSafari60211802SourcebmallocbmallocVMHeapcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/VMHeap.cpp (196191 => 196192)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/VMHeap.cpp 2016-02-05 22:30:04 UTC (rev 196191)
+++ tags/Safari-602.1.18.0.2/Source/bmalloc/bmalloc/VMHeap.cpp 2016-02-05 23:16:42 UTC (rev 196192)
</span><span class="lines">@@ -53,7 +53,9 @@
</span><span class="cx"> m_mediumPages.push(it);
</span><span class="cx">
</span><span class="cx"> LargeChunk* largeChunk = superChunk->largeChunk();
</span><del>- m_largeObjects.insert(LargeObject(LargeObject::init(largeChunk).begin()));
</del><ins>+ LargeObject result(LargeObject::init(largeChunk).begin());
+ BASSERT(result.size() == largeMax);
+ m_largeObjects.insert(result);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace bmalloc
</span></span></pre>
</div>
</div>
</body>
</html>