<!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>[196584] branches/safari-601.1.46-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/196584">196584</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-02-15 11:58:59 -0800 (Mon, 15 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/196421">r196421</a>. rdar://problem/24620164</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchSourcebmallocChangeLog">branches/safari-601.1.46-branch/Source/bmalloc/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourcebmallocbmallocHeapcpp">branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.cpp</a></li>
<li><a href="#branchessafari601146branchSourcebmallocbmallocHeaph">branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.h</a></li>
<li><a href="#branchessafari601146branchSourcebmallocbmallocLargeObjecth">branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/LargeObject.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/bmalloc/ChangeLog (196583 => 196584)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/bmalloc/ChangeLog 2016-02-15 19:56:18 UTC (rev 196583)
+++ branches/safari-601.1.46-branch/Source/bmalloc/ChangeLog 2016-02-15 19:58:59 UTC (rev 196584)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-02-15 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r196421.
+
+ 2016-02-11 Michael Saboff <msaboff@apple.com>
+
+ bmalloc: large aligned allocations will put 1 or 2 free object on free list without merging with free neighbors
+ https://bugs.webkit.org/show_bug.cgi?id=154091
+
+ Reviewed by Geoffrey Garen.
+
+ If we split off any unused free object in the aligned version of Heap::allocateLarge(), we merge them with
+ free neighbors before putting them back on the free list. Added helpers to verify that when we
+ add LargeObjects to the free list their neighbors are allocated.
+
+ * bmalloc/Heap.cpp:
+ (bmalloc::Heap::allocateLarge): Deleted private helper version and rolled it into the two the
+ two public versions of allocateLarge().
+ * bmalloc/Heap.h:
+ * bmalloc/LargeObject.h:
+ (bmalloc::LargeObject::prevIsAllocated): New helper.
+ (bmalloc::LargeObject::nextIsAllocated): New helper.
+ (bmalloc::LargeObject::merge): Check that the merge object has allocated neighbors.
+
</ins><span class="cx"> 2015-07-26 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187270.
</span></span></pre></div>
<a id="branchessafari601146branchSourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.cpp (196583 => 196584)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.cpp 2016-02-15 19:56:18 UTC (rev 196583)
+++ branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.cpp 2016-02-15 19:58:59 UTC (rev 196584)
</span><span class="lines">@@ -327,22 +327,8 @@
</span><span class="cx"> lock.lock();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void* Heap::allocateLarge(std::lock_guard<StaticMutex>&, LargeObject& largeObject, size_t size)
</del><ins>+void* Heap::allocateLarge(std::lock_guard<StaticMutex>&, size_t size)
</ins><span class="cx"> {
</span><del>- BASSERT(largeObject.isFree());
-
- if (largeObject.size() - size > largeMin) {
- std::pair<LargeObject, LargeObject> split = largeObject.split(size);
- largeObject = split.first;
- m_largeObjects.insert(split.second);
- }
-
- largeObject.setFree(false);
- return largeObject.begin();
-}
-
-void* Heap::allocateLarge(std::lock_guard<StaticMutex>& lock, size_t size)
-{
</del><span class="cx"> BASSERT(size <= largeMax);
</span><span class="cx"> BASSERT(size >= largeMin);
</span><span class="cx"> BASSERT(size == roundUpToMultipleOf<largeAlignment>(size));
</span><span class="lines">@@ -353,10 +339,27 @@
</span><span class="cx"> largeObject = m_vmHeap.allocateLargeObject(size);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return allocateLarge(lock, largeObject, size);
</del><ins>+ BASSERT(largeObject.isFree());
+
+ LargeObject nextLargeObject;
+
+ if (largeObject.size() - size > largeMin) {
+ std::pair<LargeObject, LargeObject> split = largeObject.split(size);
+ largeObject = split.first;
+ nextLargeObject = split.second;
+ }
+
+ largeObject.setFree(false);
+
+ if (nextLargeObject) {
+ BASSERT(nextLargeObject.nextIsAllocated());
+ m_largeObjects.insert(nextLargeObject);
+ }
+
+ return largeObject.begin();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void* Heap::allocateLarge(std::lock_guard<StaticMutex>& lock, size_t alignment, size_t size, size_t unalignedSize)
</del><ins>+void* Heap::allocateLarge(std::lock_guard<StaticMutex>&, size_t alignment, size_t size, size_t unalignedSize)
</ins><span class="cx"> {
</span><span class="cx"> BASSERT(size <= largeMax);
</span><span class="cx"> BASSERT(size >= largeMin);
</span><span class="lines">@@ -374,15 +377,38 @@
</span><span class="cx"> largeObject = m_vmHeap.allocateLargeObject(alignment, size, unalignedSize);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ LargeObject prevLargeObject;
+ LargeObject nextLargeObject;
+
</ins><span class="cx"> size_t alignmentMask = alignment - 1;
</span><span class="cx"> if (test(largeObject.begin(), alignmentMask)) {
</span><span class="cx"> size_t prefixSize = roundUpToMultipleOf(alignment, largeObject.begin() + largeMin) - largeObject.begin();
</span><span class="cx"> std::pair<LargeObject, LargeObject> pair = largeObject.split(prefixSize);
</span><del>- m_largeObjects.insert(pair.first);
</del><ins>+ prevLargeObject = pair.first;
</ins><span class="cx"> largeObject = pair.second;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return allocateLarge(lock, largeObject, size);
</del><ins>+ BASSERT(largeObject.isFree());
+
+ if (largeObject.size() - size > largeMin) {
+ std::pair<LargeObject, LargeObject> split = largeObject.split(size);
+ largeObject = split.first;
+ nextLargeObject = split.second;
+ }
+
+ largeObject.setFree(false);
+
+ if (prevLargeObject) {
+ LargeObject merged = prevLargeObject.merge();
+ m_largeObjects.insert(merged);
+ }
+
+ if (nextLargeObject) {
+ LargeObject merged = nextLargeObject.merge();
+ m_largeObjects.insert(merged);
+ }
+
+ return largeObject.begin();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Heap::deallocateLarge(std::lock_guard<StaticMutex>&, const LargeObject& largeObject)
</span></span></pre></div>
<a id="branchessafari601146branchSourcebmallocbmallocHeaph"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.h (196583 => 196584)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.h 2016-02-15 19:56:18 UTC (rev 196583)
+++ branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.h 2016-02-15 19:58:59 UTC (rev 196584)
</span><span class="lines">@@ -82,7 +82,6 @@
</span><span class="cx"> void deallocateSmallLine(std::lock_guard<StaticMutex>&, SmallLine*);
</span><span class="cx"> void deallocateMediumLine(std::lock_guard<StaticMutex>&, MediumLine*);
</span><span class="cx">
</span><del>- void* allocateLarge(std::lock_guard<StaticMutex>&, LargeObject&, size_t);
</del><span class="cx"> void deallocateLarge(std::lock_guard<StaticMutex>&, const LargeObject&);
</span><span class="cx">
</span><span class="cx"> void splitLarge(BeginTag*, size_t, EndTag*&, Range&);
</span></span></pre></div>
<a id="branchessafari601146branchSourcebmallocbmallocLargeObjecth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/LargeObject.h (196583 => 196584)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/LargeObject.h 2016-02-15 19:56:18 UTC (rev 196583)
+++ branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/LargeObject.h 2016-02-15 19:58:59 UTC (rev 196584)
</span><span class="lines">@@ -53,6 +53,9 @@
</span><span class="cx">
</span><span class="cx"> void setFree(bool) const;
</span><span class="cx"> bool isFree() const;
</span><ins>+
+ bool prevIsAllocated() const;
+ bool nextIsAllocated() const;
</ins><span class="cx">
</span><span class="cx"> Owner owner() const;
</span><span class="cx"> void setOwner(Owner) const;
</span><span class="lines">@@ -118,6 +121,21 @@
</span><span class="cx"> return m_beginTag->isFree();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool LargeObject::prevIsAllocated() const
+{
+ EndTag* prev = m_beginTag->prev();
+
+ return !prev->isFree() || prev->owner() != this->owner();
+}
+
+inline bool LargeObject::nextIsAllocated() const
+{
+ BeginTag* next = m_endTag->next();
+
+ return !next->isFree() || next->owner() != this->owner();
+}
+
+
</ins><span class="cx"> inline Owner LargeObject::owner() const
</span><span class="cx"> {
</span><span class="cx"> validate();
</span><span class="lines">@@ -201,7 +219,11 @@
</span><span class="cx"> beginTag->setOwner(owner);
</span><span class="cx"> endTag->init(beginTag);
</span><span class="cx">
</span><del>- return LargeObject(beginTag, endTag, range.begin());
</del><ins>+ LargeObject result(beginTag, endTag, range.begin());
+ BASSERT(result.prevIsAllocated());
+ BASSERT(result.nextIsAllocated());
+
+ return result;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> inline std::pair<LargeObject, LargeObject> LargeObject::split(size_t size) const
</span></span></pre>
</div>
</div>
</body>
</html>