<!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>[195098] releases/WebKitGTK/webkit-2.10/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/195098">195098</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-15 00:58:50 -0800 (Fri, 15 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/193373">r193373</a> - bmalloc: extra large allocations could be more efficient
https://bugs.webkit.org/show_bug.cgi?id=151817

Reviewed by Geoffrey Garen.

Reduced the super chunk size from 4MB to 2MB.

Added path to reallocate() of an extra large object to see if we can extend the allocation.

* bmalloc/Allocator.cpp:
(bmalloc::Allocator::reallocate):
* bmalloc/SegregatedFreeList.h:
* bmalloc/Sizes.h:
* bmalloc/VMAllocate.h:
(bmalloc::tryVMAllocate):
(bmalloc::tryVMExtend):
(bmalloc::vmAllocate):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourcebmallocChangeLog">releases/WebKitGTK/webkit-2.10/Source/bmalloc/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourcebmallocbmallocAllocatorcpp">releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/Allocator.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourcebmallocbmallocSegregatedFreeListh">releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/SegregatedFreeList.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourcebmallocbmallocSizesh">releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/Sizes.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourcebmallocbmallocVMAllocateh">releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/VMAllocate.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/bmalloc/ChangeLog (195097 => 195098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/bmalloc/ChangeLog        2016-01-15 08:36:26 UTC (rev 195097)
+++ releases/WebKitGTK/webkit-2.10/Source/bmalloc/ChangeLog        2016-01-15 08:58:50 UTC (rev 195098)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-03  Michael Saboff  &lt;msaboff@apple.com&gt;
+
+        bmalloc: extra large allocations could be more efficient
+        https://bugs.webkit.org/show_bug.cgi?id=151817
+
+        Reviewed by Geoffrey Garen.
+
+        Reduced the super chunk size from 4MB to 2MB.
+
+        Added path to reallocate() of an extra large object to see if we can extend the allocation.
+
+        * bmalloc/Allocator.cpp:
+        (bmalloc::Allocator::reallocate):
+        * bmalloc/SegregatedFreeList.h:
+        * bmalloc/Sizes.h:
+        * bmalloc/VMAllocate.h:
+        (bmalloc::tryVMAllocate):
+        (bmalloc::tryVMExtend):
+        (bmalloc::vmAllocate):
+
</ins><span class="cx"> 2015-11-01  Philip Chimento  &lt;philip.chimento@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Fix combinations of PLATFORM(GTK) and OS(DARWIN)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/Allocator.cpp (195097 => 195098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/Allocator.cpp        2016-01-15 08:36:26 UTC (rev 195097)
+++ releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/Allocator.cpp        2016-01-15 08:58:50 UTC (rev 195098)
</span><span class="lines">@@ -162,6 +162,11 @@
</span><span class="cx">         Range&amp; range = PerProcess&lt;Heap&gt;::getFastCase()-&gt;findXLarge(lock, object);
</span><span class="cx">         oldSize = range.size();
</span><span class="cx"> 
</span><ins>+        newSize = roundUpToMultipleOf&lt;xLargeAlignment&gt;(newSize);
+
+        if (newSize == oldSize)
+            return object;
+
</ins><span class="cx">         if (newSize &lt; oldSize &amp;&amp; newSize &gt; largeMax) {
</span><span class="cx">             newSize = roundUpToMultipleOf&lt;xLargeAlignment&gt;(newSize);
</span><span class="cx">             if (oldSize - newSize &gt;= xLargeAlignment) {
</span><span class="lines">@@ -173,6 +178,17 @@
</span><span class="cx">             }
</span><span class="cx">             return object;
</span><span class="cx">         }
</span><ins>+
+        if (newSize &gt; oldSize) {
+            lock.unlock();
+            bool wasExtended = tryVMExtend(object, oldSize, newSize);
+            lock.lock();
+
+            if (wasExtended) {
+                range = Range(object, newSize);
+                return object;
+            }
+        }
</ins><span class="cx">         break;
</span><span class="cx">     }
</span><span class="cx">     }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourcebmallocbmallocSegregatedFreeListh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/SegregatedFreeList.h (195097 => 195098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/SegregatedFreeList.h        2016-01-15 08:36:26 UTC (rev 195097)
+++ releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/SegregatedFreeList.h        2016-01-15 08:58:50 UTC (rev 195098)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx">     FreeList&amp; select(size_t);
</span><span class="cx"> 
</span><span class="cx">     Owner m_owner;
</span><del>-    std::array&lt;FreeList, 16&gt; m_freeLists;
</del><ins>+    std::array&lt;FreeList, 15&gt; m_freeLists;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace bmalloc
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourcebmallocbmallocSizesh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/Sizes.h (195097 => 195098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/Sizes.h        2016-01-15 08:36:26 UTC (rev 195097)
+++ releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/Sizes.h        2016-01-15 08:58:50 UTC (rev 195098)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> #endif
</span><span class="cx">     static const size_t vmPageMask = ~(vmPageSize - 1);
</span><span class="cx">     
</span><del>-    static const size_t superChunkSize = 4 * MB;
</del><ins>+    static const size_t superChunkSize = 2 * MB;
</ins><span class="cx"> 
</span><span class="cx">     static const size_t smallMax = 256;
</span><span class="cx">     static const size_t smallLineSize = 256;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourcebmallocbmallocVMAllocateh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/VMAllocate.h (195097 => 195098)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/VMAllocate.h        2016-01-15 08:36:26 UTC (rev 195097)
+++ releases/WebKitGTK/webkit-2.10/Source/bmalloc/bmalloc/VMAllocate.h        2016-01-15 08:58:50 UTC (rev 195098)
</span><span class="lines">@@ -82,6 +82,29 @@
</span><span class="cx">     return result;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+inline bool tryVMExtend(void* p, size_t vmOldSize, size_t vmNewSize)
+{
+    vmValidate(vmOldSize);
+    vmValidate(vmNewSize);
+    
+    BASSERT(vmOldSize &lt; vmNewSize);
+
+    void* nextAddress = static_cast&lt;char*&gt;(p) + vmOldSize;
+    size_t extentionSize = vmNewSize - vmOldSize;
+
+    void* result = mmap(nextAddress, extentionSize, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, BMALLOC_VM_TAG, 0);
+
+    if (result == MAP_FAILED)
+        return false;
+
+    if (result != nextAddress) {
+        munmap(result, extentionSize);
+        return false;
+    }
+    
+    return true;
+}
+
</ins><span class="cx"> inline void* vmAllocate(size_t vmSize)
</span><span class="cx"> {
</span><span class="cx">     void* result = tryVMAllocate(vmSize);
</span></span></pre>
</div>
</div>

</body>
</html>