<!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>[199440] releases/WebKitGTK/webkit-2.12/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/199440">199440</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-13 02:16:42 -0700 (Wed, 13 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198594">r198594</a> - bmalloc: process the object log before asking for new memory
https://bugs.webkit.org/show_bug.cgi?id=155801
Reviewed by Gavin Barraclough.
This is a step toward merging large and small objects: In future, if we
have large objects in the log, we need to process them right away to
avoid pushing up peak memory use.
But it also appears to be a speedup and memory use improvement now.
* bmalloc/Allocator.cpp:
(bmalloc::Allocator::allocate):
(bmalloc::Allocator::refillAllocatorSlowCase):
(bmalloc::Allocator::allocateLarge): Process the log before asking for
more memory.
* bmalloc/Deallocator.cpp:
(bmalloc::Deallocator::processObjectLog):
(bmalloc::Deallocator::deallocateSlowCase):
* bmalloc/Deallocator.h: Provide a public API for processing the object log.
* bmalloc/Heap.cpp:
(bmalloc::Heap::allocateSmallPage): Pop fragmented pages from the front
instead of from the back. This resolves a regression on tree_churn
--parallel. Popping from the front gives us the oldest pages. The oldest
pages have had the most time to accumulate free lines. They are therefore
the least fragmented on average.
* bmalloc/List.h:
(bmalloc::List::popFront):
(bmalloc::List::insertAfter): New API to pop from front.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourcebmallocChangeLog">releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourcebmallocbmallocAllocatorcpp">releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Allocator.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourcebmallocbmallocDeallocatorcpp">releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Deallocator.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourcebmallocbmallocDeallocatorh">releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Deallocator.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourcebmallocbmallocHeapcpp">releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Heap.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourcebmallocbmallocListh">releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/List.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog (199439 => 199440)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog 2016-04-13 09:15:15 UTC (rev 199439)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/ChangeLog 2016-04-13 09:16:42 UTC (rev 199440)
</span><span class="lines">@@ -1,3 +1,38 @@
</span><ins>+2016-03-23 Geoffrey Garen <ggaren@apple.com>
+
+ bmalloc: process the object log before asking for new memory
+ https://bugs.webkit.org/show_bug.cgi?id=155801
+
+ Reviewed by Gavin Barraclough.
+
+ This is a step toward merging large and small objects: In future, if we
+ have large objects in the log, we need to process them right away to
+ avoid pushing up peak memory use.
+
+ But it also appears to be a speedup and memory use improvement now.
+
+ * bmalloc/Allocator.cpp:
+ (bmalloc::Allocator::allocate):
+ (bmalloc::Allocator::refillAllocatorSlowCase):
+ (bmalloc::Allocator::allocateLarge): Process the log before asking for
+ more memory.
+
+ * bmalloc/Deallocator.cpp:
+ (bmalloc::Deallocator::processObjectLog):
+ (bmalloc::Deallocator::deallocateSlowCase):
+ * bmalloc/Deallocator.h: Provide a public API for processing the object log.
+
+ * bmalloc/Heap.cpp:
+ (bmalloc::Heap::allocateSmallPage): Pop fragmented pages from the front
+ instead of from the back. This resolves a regression on tree_churn
+ --parallel. Popping from the front gives us the oldest pages. The oldest
+ pages have had the most time to accumulate free lines. They are therefore
+ the least fragmented on average.
+
+ * bmalloc/List.h:
+ (bmalloc::List::popFront):
+ (bmalloc::List::insertAfter): New API to pop from front.
+
</ins><span class="cx"> 2016-03-22 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> bmalloc: use a log scale for large-ish size classes
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Allocator.cpp (199439 => 199440)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Allocator.cpp 2016-04-13 09:15:15 UTC (rev 199439)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Allocator.cpp 2016-04-13 09:16:42 UTC (rev 199440)
</span><span class="lines">@@ -93,6 +93,7 @@
</span><span class="cx"> size_t unalignedSize = largeMin + alignment - largeAlignment + size;
</span><span class="cx"> if (unalignedSize <= largeMax && alignment <= largeChunkSize / 2) {
</span><span class="cx"> std::lock_guard<StaticMutex> lock(PerProcess<Heap>::mutex());
</span><ins>+ m_deallocator.processObjectLog(lock);
</ins><span class="cx"> return PerProcess<Heap>::getFastCase()->allocateLarge(lock, alignment, size, unalignedSize);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -186,6 +187,7 @@
</span><span class="cx"> BumpRangeCache& bumpRangeCache = m_bumpRangeCaches[sizeClass];
</span><span class="cx">
</span><span class="cx"> std::lock_guard<StaticMutex> lock(PerProcess<Heap>::mutex());
</span><ins>+ m_deallocator.processObjectLog(lock);
</ins><span class="cx"> PerProcess<Heap>::getFastCase()->allocateSmallBumpRanges(lock, sizeClass, allocator, bumpRangeCache);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -200,7 +202,9 @@
</span><span class="cx"> NO_INLINE void* Allocator::allocateLarge(size_t size)
</span><span class="cx"> {
</span><span class="cx"> size = roundUpToMultipleOf<largeAlignment>(size);
</span><ins>+
</ins><span class="cx"> std::lock_guard<StaticMutex> lock(PerProcess<Heap>::mutex());
</span><ins>+ m_deallocator.processObjectLog(lock);
</ins><span class="cx"> return PerProcess<Heap>::getFastCase()->allocateLarge(lock, size);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourcebmallocbmallocDeallocatorcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Deallocator.cpp (199439 => 199440)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Deallocator.cpp 2016-04-13 09:15:15 UTC (rev 199439)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Deallocator.cpp 2016-04-13 09:16:42 UTC (rev 199440)
</span><span class="lines">@@ -71,9 +71,8 @@
</span><span class="cx"> PerProcess<Heap>::getFastCase()->deallocateXLarge(lock, object);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Deallocator::processObjectLog()
</del><ins>+void Deallocator::processObjectLog(std::lock_guard<StaticMutex>& lock)
</ins><span class="cx"> {
</span><del>- std::lock_guard<StaticMutex> lock(PerProcess<Heap>::mutex());
</del><span class="cx"> Heap* heap = PerProcess<Heap>::getFastCase();
</span><span class="cx">
</span><span class="cx"> for (auto* object : m_objectLog) {
</span><span class="lines">@@ -84,6 +83,12 @@
</span><span class="cx"> m_objectLog.clear();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void Deallocator::processObjectLog()
+{
+ std::lock_guard<StaticMutex> lock(PerProcess<Heap>::mutex());
+ processObjectLog(lock);
+}
+
</ins><span class="cx"> void Deallocator::deallocateSlowCase(void* object)
</span><span class="cx"> {
</span><span class="cx"> BASSERT(!deallocateFastCase(object));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourcebmallocbmallocDeallocatorh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Deallocator.h (199439 => 199440)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Deallocator.h 2016-04-13 09:15:15 UTC (rev 199439)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Deallocator.h 2016-04-13 09:16:42 UTC (rev 199440)
</span><span class="lines">@@ -27,10 +27,12 @@
</span><span class="cx"> #define Deallocator_h
</span><span class="cx">
</span><span class="cx"> #include "FixedVector.h"
</span><ins>+#include <mutex>
</ins><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span><span class="cx"> class Heap;
</span><ins>+class StaticMutex;
</ins><span class="cx">
</span><span class="cx"> // Per-cache object deallocator.
</span><span class="cx">
</span><span class="lines">@@ -42,13 +44,15 @@
</span><span class="cx"> void deallocate(void*);
</span><span class="cx"> void scavenge();
</span><span class="cx">
</span><ins>+ void processObjectLog();
+ void processObjectLog(std::lock_guard<StaticMutex>&);
+
</ins><span class="cx"> private:
</span><span class="cx"> bool deallocateFastCase(void*);
</span><span class="cx"> void deallocateSlowCase(void*);
</span><span class="cx">
</span><span class="cx"> void deallocateLarge(void*);
</span><span class="cx"> void deallocateXLarge(void*);
</span><del>- void processObjectLog();
</del><span class="cx">
</span><span class="cx"> FixedVector<void*, deallocatorLogCapacity> m_objectLog;
</span><span class="cx"> bool m_isBmallocEnabled;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Heap.cpp (199439 => 199440)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Heap.cpp 2016-04-13 09:15:15 UTC (rev 199439)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/Heap.cpp 2016-04-13 09:16:42 UTC (rev 199440)
</span><span class="lines">@@ -178,7 +178,7 @@
</span><span class="cx"> SmallPage* Heap::allocateSmallPage(std::lock_guard<StaticMutex>& lock, size_t sizeClass)
</span><span class="cx"> {
</span><span class="cx"> if (!m_smallPagesWithFreeLines[sizeClass].isEmpty())
</span><del>- return m_smallPagesWithFreeLines[sizeClass].pop();
</del><ins>+ return m_smallPagesWithFreeLines[sizeClass].popFront();
</ins><span class="cx">
</span><span class="cx"> SmallPage* page = [this, &lock]() {
</span><span class="cx"> if (!m_smallPages.isEmpty())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourcebmallocbmallocListh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/List.h (199439 => 199440)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/List.h 2016-04-13 09:15:15 UTC (rev 199439)
+++ releases/WebKitGTK/webkit-2.12/Source/bmalloc/bmalloc/List.h 2016-04-13 09:16:42 UTC (rev 199440)
</span><span class="lines">@@ -62,6 +62,13 @@
</span><span class="cx"> return static_cast<T*>(result);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ T* popFront()
+ {
+ ListNode<T>* result = head();
+ remove(result);
+ return static_cast<T*>(result);
+ }
+
</ins><span class="cx"> void insertAfter(ListNode<T>* it, ListNode<T>* node)
</span><span class="cx"> {
</span><span class="cx"> ListNode<T>* prev = it;
</span></span></pre>
</div>
</div>
</body>
</html>