<!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>[178377] 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/178377">178377</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-01-13 14:26:57 -0800 (Tue, 13 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Consider alignment when allocating from a SegregatedFreeList
https://bugs.webkit.org/show_bug.cgi?id=140408
Reviewed by Sam Weinig.
In preparation for supporting aligned allocation.
No performance change.
Since this is just one extra branch in an already expensive function,
I decided not to duplicate the function just to avoid the branch in
the un-aligned case.
* bmalloc/SegregatedFreeList.cpp:
(bmalloc::SegregatedFreeList::take):
* bmalloc/SegregatedFreeList.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocSegregatedFreeListcpp">trunk/Source/bmalloc/bmalloc/SegregatedFreeList.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocSegregatedFreeListh">trunk/Source/bmalloc/bmalloc/SegregatedFreeList.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (178376 => 178377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-01-13 22:23:41 UTC (rev 178376)
+++ trunk/Source/bmalloc/ChangeLog 2015-01-13 22:26:57 UTC (rev 178377)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2015-01-13 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ Consider alignment when allocating from a SegregatedFreeList
+ https://bugs.webkit.org/show_bug.cgi?id=140408
+
+ Reviewed by Sam Weinig.
+
+ In preparation for supporting aligned allocation.
+
+ No performance change.
+
+ Since this is just one extra branch in an already expensive function,
+ I decided not to duplicate the function just to avoid the branch in
+ the un-aligned case.
+
+ * bmalloc/SegregatedFreeList.cpp:
+ (bmalloc::SegregatedFreeList::take):
+ * bmalloc/SegregatedFreeList.h:
+
+2015-01-13 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> Renamed minimum to size in SegregatedFreeList
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=140406
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocSegregatedFreeListcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/SegregatedFreeList.cpp (178376 => 178377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/SegregatedFreeList.cpp 2015-01-13 22:23:41 UTC (rev 178376)
+++ trunk/Source/bmalloc/bmalloc/SegregatedFreeList.cpp 2015-01-13 22:26:57 UTC (rev 178377)
</span><span class="lines">@@ -81,10 +81,10 @@
</span><span class="cx"> return Range();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Range SegregatedFreeList::take(size_t size)
</del><ins>+Range SegregatedFreeList::take(size_t size, size_t alignmentMask)
</ins><span class="cx"> {
</span><span class="cx"> for (auto* list = &select(size); list != m_lists.end(); ++list) {
</span><del>- Range range = take(*list, size);
</del><ins>+ Range range = take(*list, size, alignmentMask);
</ins><span class="cx"> if (!range)
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> return m_lists[result];
</span><span class="cx"> }
</span><span class="cx">
</span><del>-INLINE Range SegregatedFreeList::take(List& list, size_t size)
</del><ins>+INLINE Range SegregatedFreeList::take(List& list, size_t size, size_t alignmentMask)
</ins><span class="cx"> {
</span><span class="cx"> Range first;
</span><span class="cx"> size_t end = list.size() > segregatedFreeListSearchDepth ? list.size() - segregatedFreeListSearchDepth : 0;
</span><span class="lines">@@ -122,6 +122,9 @@
</span><span class="cx"> if (range.size() < size)
</span><span class="cx"> continue;
</span><span class="cx">
</span><ins>+ if (test(range.begin(), alignmentMask))
+ continue;
+
</ins><span class="cx"> if (!!first && first < range)
</span><span class="cx"> continue;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocSegregatedFreeListh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/SegregatedFreeList.h (178376 => 178377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/SegregatedFreeList.h 2015-01-13 22:23:41 UTC (rev 178376)
+++ trunk/Source/bmalloc/bmalloc/SegregatedFreeList.h 2015-01-13 22:26:57 UTC (rev 178377)
</span><span class="lines">@@ -38,11 +38,12 @@
</span><span class="cx">
</span><span class="cx"> void insert(const Range&);
</span><span class="cx">
</span><del>- // Returns a reasonable fit for the provided size, or Range() if no fit
- // is found. May return Range() spuriously if searching takes too long.
- // Incrementally removes stale items from the free list while searching.
- // Does not eagerly remove the returned range from the free list.
- Range take(size_t);
</del><ins>+ // Returns a reasonable fit for the provided size and optional alignment
+ // mask, or Range() if no fit is found. May return Range() spuriously if
+ // searching takes too long. Incrementally removes stale items from the
+ // free list while searching. Does not eagerly remove the returned range
+ // from the free list.
+ Range take(size_t, size_t alignmentMask = 0);
</ins><span class="cx">
</span><span class="cx"> // Returns an unreasonable fit for the provided size, or Range() if no fit
</span><span class="cx"> // is found. Never returns Range() spuriously.
</span><span class="lines">@@ -54,8 +55,7 @@
</span><span class="cx"> typedef Vector<Range> List;
</span><span class="cx">
</span><span class="cx"> List& select(size_t);
</span><del>-
- Range take(List&, size_t);
</del><ins>+ Range take(List&, size_t, size_t alignmentMask);
</ins><span class="cx"> Range takeGreedy(List&, size_t);
</span><span class="cx">
</span><span class="cx"> std::array<List, 19> m_lists;
</span></span></pre>
</div>
</div>
</body>
</html>