<!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>[173525] trunk/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/173525">173525</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-09-11 12:12:48 -0700 (Thu, 11 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reviewed by Sam Weinig.
Renamed log => retire for clarity.
* bmalloc/Allocator.cpp:
(bmalloc::Allocator::scavenge):
(bmalloc::Allocator::retire):
(bmalloc::Allocator::allocateMedium):
(bmalloc::Allocator::allocateSlowCase):
(bmalloc::Allocator::log): Deleted.
* bmalloc/Allocator.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocAllocatorcpp">trunk/Source/bmalloc/bmalloc/Allocator.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocAllocatorh">trunk/Source/bmalloc/bmalloc/Allocator.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (173524 => 173525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-09-11 19:05:38 UTC (rev 173524)
+++ trunk/Source/bmalloc/ChangeLog 2014-09-11 19:12:48 UTC (rev 173525)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2014-09-11 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ Reviewed by Sam Weinig.
+
+ Renamed log => retire for clarity.
+
+ * bmalloc/Allocator.cpp:
+ (bmalloc::Allocator::scavenge):
+ (bmalloc::Allocator::retire):
+ (bmalloc::Allocator::allocateMedium):
+ (bmalloc::Allocator::allocateSlowCase):
+ (bmalloc::Allocator::log): Deleted.
+ * bmalloc/Allocator.h:
+
+2014-09-11 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> bmalloc: eager scavenge leaves behind a bogus allocator
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136743
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (173524 => 173525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-09-11 19:05:38 UTC (rev 173524)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-09-11 19:12:48 UTC (rev 173525)
</span><span class="lines">@@ -57,17 +57,17 @@
</span><span class="cx"> void Allocator::scavenge()
</span><span class="cx"> {
</span><span class="cx"> for (auto& allocator : m_smallAllocators) {
</span><del>- log(allocator);
</del><ins>+ retire(allocator);
</ins><span class="cx"> allocator.clear();
</span><span class="cx"> }
</span><span class="cx"> processSmallAllocatorLog();
</span><span class="cx">
</span><del>- log(m_mediumAllocator);
</del><ins>+ retire(m_mediumAllocator);
</ins><span class="cx"> m_mediumAllocator.clear();
</span><span class="cx"> processMediumAllocatorLog();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Allocator::log(SmallAllocator& allocator)
</del><ins>+void Allocator::retire(SmallAllocator& allocator)
</ins><span class="cx"> {
</span><span class="cx"> if (m_smallAllocatorLog.size() == m_smallAllocatorLog.capacity())
</span><span class="cx"> processSmallAllocatorLog();
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> m_smallAllocatorLog.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Allocator::log(MediumAllocator& allocator)
</del><ins>+void Allocator::retire(MediumAllocator& allocator)
</ins><span class="cx"> {
</span><span class="cx"> if (m_mediumAllocatorLog.size() == m_mediumAllocatorLog.capacity())
</span><span class="cx"> processMediumAllocatorLog();
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> if (allocator.allocate(size, object))
</span><span class="cx"> return object;
</span><span class="cx">
</span><del>- log(allocator);
</del><ins>+ retire(allocator);
</ins><span class="cx"> allocator.refill(m_deallocator.allocateMediumLine());
</span><span class="cx"> return allocator.allocate(size);
</span><span class="cx"> }
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> if (size <= smallMax) {
</span><span class="cx"> size_t smallSizeClass = smallSizeClassFor(size);
</span><span class="cx"> SmallAllocator& allocator = m_smallAllocators[smallSizeClass];
</span><del>- log(allocator);
</del><ins>+ retire(allocator);
</ins><span class="cx"> allocator.refill(m_deallocator.allocateSmallLine(smallSizeClass));
</span><span class="cx"> return allocator.allocate();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.h (173524 => 173525)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.h 2014-09-11 19:05:38 UTC (rev 173524)
+++ trunk/Source/bmalloc/bmalloc/Allocator.h 2014-09-11 19:12:48 UTC (rev 173525)
</span><span class="lines">@@ -56,8 +56,8 @@
</span><span class="cx"> void* allocateLarge(size_t);
</span><span class="cx"> void* allocateXLarge(size_t);
</span><span class="cx">
</span><del>- void log(SmallAllocator&);
- void log(MediumAllocator&);
</del><ins>+ void retire(SmallAllocator&);
+ void retire(MediumAllocator&);
</ins><span class="cx">
</span><span class="cx"> void processSmallAllocatorLog();
</span><span class="cx"> void processMediumAllocatorLog();
</span></span></pre>
</div>
</div>
</body>
</html>