<!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>[196586] 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/196586">196586</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2016-02-15 12:01:09 -0800 (Mon, 15 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/196536">r196536</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="#branchessafari601146branchSourcebmallocbmallocFreeListh">branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/FreeList.h</a></li>
<li><a href="#branchessafari601146branchSourcebmallocbmallocHeapcpp">branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.cpp</a></li>
<li><a href="#branchessafari601146branchSourcebmallocbmallocLargeObjecth">branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/LargeObject.h</a></li>
<li><a href="#branchessafari601146branchSourcebmallocbmallocVMHeaph">branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/VMHeap.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 (196585 => 196586)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/bmalloc/ChangeLog 2016-02-15 19:59:46 UTC (rev 196585)
+++ branches/safari-601.1.46-branch/Source/bmalloc/ChangeLog 2016-02-15 20:01:09 UTC (rev 196586)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2016-02-15 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><ins>+ Merge r196536.
+
+ 2016-02-12 Michael Saboff <msaboff@apple.com>
+
+ BASSERTs added in r196421 are causing debug test failures
+ https://bugs.webkit.org/show_bug.cgi?id=154113
+
+ Reviewed by Geoffrey Garen.
+
+ In VMHeap::deallocateLargeObject(), we drop the lock to deallocate the physical pages.
+ If the scavenger thread is running at the same time a synchronous call to scavenge()
+ comes in, we could call VMHeap::deallocateLargeObject() for an adjacent object while the
+ lock in the other thread is dropped. We fix this by checking for adjacent objects we
+ can merge with and loop if we have one.
+
+ * bmalloc/FreeList.h:
+ (bmalloc::FreeList::push): Added BASSERT to catch adding unmerged free objects
+ * bmalloc/Heap.cpp:
+ (bmalloc::Heap::allocateLarge): Changed to use nextCanMerge().
+ * bmalloc/LargeObject.h:
+ (bmalloc::LargeObject::prevCanMerge): Repurposed prevIsAllocated.
+ (bmalloc::LargeObject::nextCanMerge): Repurposed nextIsAllocated.
+ (bmalloc::LargeObject::prevIsAllocated): Deleted.
+ (bmalloc::LargeObject::nextIsAllocated): Deleted.
+ * bmalloc/VMHeap.h:
+ (bmalloc::VMHeap::allocateLargeObject): Moved adding the extra object back to the free list
+ to after we set the object we'll return as being allocated.
+ (bmalloc::VMHeap::deallocateLargeObject):
+
+2016-02-15 Babak Shafiei <bshafiei@apple.com>
+
</ins><span class="cx"> Merge r196424.
</span><span class="cx">
</span><span class="cx"> 2016-02-11 Michael Saboff <msaboff@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourcebmallocbmallocFreeListh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/FreeList.h (196585 => 196586)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/FreeList.h 2016-02-15 19:59:46 UTC (rev 196585)
+++ branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/FreeList.h 2016-02-15 20:01:09 UTC (rev 196586)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -60,6 +60,8 @@
</span><span class="cx"> inline void FreeList::push(Owner owner, const LargeObject& largeObject)
</span><span class="cx"> {
</span><span class="cx"> BASSERT(largeObject.isFree());
</span><ins>+ BASSERT(!largeObject.prevCanMerge());
+ BASSERT(!largeObject.nextCanMerge());
</ins><span class="cx"> if (m_vector.size() == m_limit) {
</span><span class="cx"> removeInvalidAndDuplicateEntries(owner);
</span><span class="cx"> m_limit = std::max(m_vector.size() * freeListGrowFactor, freeListSearchDepth);
</span></span></pre></div>
<a id="branchessafari601146branchSourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.cpp (196585 => 196586)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.cpp 2016-02-15 19:59:46 UTC (rev 196585)
+++ branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/Heap.cpp 2016-02-15 20:01:09 UTC (rev 196586)
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> largeObject.setFree(false);
</span><span class="cx">
</span><span class="cx"> if (nextLargeObject) {
</span><del>- BASSERT(nextLargeObject.nextIsAllocated());
</del><ins>+ BASSERT(!nextLargeObject.nextCanMerge());
</ins><span class="cx"> m_largeObjects.insert(nextLargeObject);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchSourcebmallocbmallocLargeObjecth"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/LargeObject.h (196585 => 196586)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/LargeObject.h 2016-02-15 19:59:46 UTC (rev 196585)
+++ branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/LargeObject.h 2016-02-15 20:01:09 UTC (rev 196586)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2015-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -54,9 +54,9 @@
</span><span class="cx"> void setFree(bool) const;
</span><span class="cx"> bool isFree() const;
</span><span class="cx">
</span><del>- bool prevIsAllocated() const;
- bool nextIsAllocated() const;
-
</del><ins>+ bool prevCanMerge() const;
+ bool nextCanMerge() const;
+
</ins><span class="cx"> Owner owner() const;
</span><span class="cx"> void setOwner(Owner) const;
</span><span class="cx">
</span><span class="lines">@@ -121,21 +121,20 @@
</span><span class="cx"> return m_beginTag->isFree();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool LargeObject::prevIsAllocated() const
</del><ins>+inline bool LargeObject::prevCanMerge() const
</ins><span class="cx"> {
</span><span class="cx"> EndTag* prev = m_beginTag->prev();
</span><span class="cx">
</span><del>- return !prev->isFree() || prev->owner() != this->owner();
</del><ins>+ return prev->isFree() && prev->owner() == this->owner();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-inline bool LargeObject::nextIsAllocated() const
</del><ins>+inline bool LargeObject::nextCanMerge() const
</ins><span class="cx"> {
</span><span class="cx"> BeginTag* next = m_endTag->next();
</span><span class="cx">
</span><del>- return !next->isFree() || next->owner() != this->owner();
</del><ins>+ return next->isFree() && next->owner() == this->owner();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><span class="cx"> inline Owner LargeObject::owner() const
</span><span class="cx"> {
</span><span class="cx"> validate();
</span></span></pre></div>
<a id="branchessafari601146branchSourcebmallocbmallocVMHeaph"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/VMHeap.h (196585 => 196586)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/VMHeap.h 2016-02-15 19:59:46 UTC (rev 196585)
+++ branches/safari-601.1.46-branch/Source/bmalloc/bmalloc/VMHeap.h 2016-02-15 20:01:09 UTC (rev 196586)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014-2016 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -57,7 +57,7 @@
</span><span class="cx">
</span><span class="cx"> void deallocateSmallPage(std::unique_lock<StaticMutex>&, SmallPage*);
</span><span class="cx"> void deallocateMediumPage(std::unique_lock<StaticMutex>&, MediumPage*);
</span><del>- void deallocateLargeObject(std::unique_lock<StaticMutex>&, LargeObject&);
</del><ins>+ void deallocateLargeObject(std::unique_lock<StaticMutex>&, LargeObject);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> LargeObject allocateLargeObject(LargeObject&, size_t);
</span><span class="lines">@@ -95,14 +95,23 @@
</span><span class="cx"> {
</span><span class="cx"> BASSERT(largeObject.isFree());
</span><span class="cx">
</span><ins>+ LargeObject nextLargeObject;
+
</ins><span class="cx"> if (largeObject.size() - size > largeMin) {
</span><span class="cx"> std::pair<LargeObject, LargeObject> split = largeObject.split(size);
</span><span class="cx"> largeObject = split.first;
</span><del>- m_largeObjects.insert(split.second);
</del><ins>+ nextLargeObject = split.second;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> vmAllocatePhysicalPagesSloppy(largeObject.begin(), largeObject.size());
</span><span class="cx"> largeObject.setOwner(Owner::Heap);
</span><ins>+
+ // Be sure to set the owner for the object we return before inserting the leftover back
+ // into the free list. The free list asserts that we never insert an object that could
+ // have merged with its neighbor.
+ if (nextLargeObject)
+ m_largeObjects.insert(nextLargeObject);
+
</ins><span class="cx"> return largeObject.begin();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -151,25 +160,29 @@
</span><span class="cx"> m_mediumPages.push(page);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void VMHeap::deallocateLargeObject(std::unique_lock<StaticMutex>& lock, LargeObject& largeObject)
</del><ins>+inline void VMHeap::deallocateLargeObject(std::unique_lock<StaticMutex>& lock, LargeObject largeObject)
</ins><span class="cx"> {
</span><span class="cx"> largeObject.setOwner(Owner::VMHeap);
</span><del>-
- // If we couldn't merge with our neighbors before because they were in the
- // VM heap, we can merge with them now.
- LargeObject merged = largeObject.merge();
</del><span class="cx">
</span><del>- // Temporarily mark this object as allocated to prevent clients from merging
- // with it or allocating it while we're messing with its physical pages.
- merged.setFree(false);
</del><ins>+ // Multiple threads might scavenge concurrently, meaning that new merging opportunities
+ // become visible after we reacquire the lock. Therefore we loop.
+ do {
+ // If we couldn't merge with our neighbors before because they were in the
+ // VM heap, we can merge with them now.
+ largeObject = largeObject.merge();
</ins><span class="cx">
</span><del>- lock.unlock();
- vmDeallocatePhysicalPagesSloppy(merged.begin(), merged.size());
- lock.lock();
</del><ins>+ // Temporarily mark this object as allocated to prevent clients from merging
+ // with it or allocating it while we're messing with its physical pages.
+ largeObject.setFree(false);
</ins><span class="cx">
</span><del>- merged.setFree(true);
</del><ins>+ lock.unlock();
+ vmDeallocatePhysicalPagesSloppy(largeObject.begin(), largeObject.size());
+ lock.lock();
</ins><span class="cx">
</span><del>- m_largeObjects.insert(merged);
</del><ins>+ largeObject.setFree(true);
+ } while (largeObject.prevCanMerge() || largeObject.nextCanMerge());
+
+ m_largeObjects.insert(largeObject);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace bmalloc
</span></span></pre>
</div>
</div>
</body>
</html>