<!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>[180829] releases/WebKitGTK/webkit-2.8/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/180829">180829</a></dd>

<dt>Author</dt> <dd>carlosgc@webkit.org</dd>

<dt>Date</dt> <dd>2015-02-28 03:31:11 -0800 (Sat, 28 Feb 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/180576">r180576</a> - bmalloc: Added a little more abstraction for large objects

https://bugs.webkit.org/show_bug.cgi?id=141978

Reviewed by Sam Weinig.

Previously, each client needed to manage the boundary tags of

a large object using free functions. This patch introduces a LargeObject

class that does things a little more automatically.

* bmalloc.xcodeproj/project.pbxproj:

* bmalloc/Allocator.cpp:

(bmalloc::Allocator::reallocate): Use the new LargeObject class.

* bmalloc/BeginTag.h:

(bmalloc::BeginTag::isInFreeList): Deleted. Moved this logic into the

LargeObject class.

* bmalloc/BoundaryTag.h:

(bmalloc::BoundaryTag::isSentinel):

(bmalloc::BoundaryTag::compactBegin):

(bmalloc::BoundaryTag::setRange):

(bmalloc::BoundaryTag::initSentinel): Added an explicit API for sentinels,

which we used to create and test for implicitly.

* bmalloc/BoundaryTagInlines.h:

(bmalloc::BoundaryTag::init):

(bmalloc::validate): Deleted.

(bmalloc::validatePrev): Deleted.

(bmalloc::validateNext): Deleted.

(bmalloc::BoundaryTag::mergeLeft): Deleted.

(bmalloc::BoundaryTag::mergeRight): Deleted.

(bmalloc::BoundaryTag::merge): Deleted.

(bmalloc::BoundaryTag::deallocate): Deleted.

(bmalloc::BoundaryTag::split): Deleted.

(bmalloc::BoundaryTag::allocate): Deleted. Moved this logic into the

LargeObject class.

* bmalloc/EndTag.h:

(bmalloc::EndTag::init):

(bmalloc::EndTag::operator=): Deleted. Re-reading this code, I found

special behavior in the assignment operator to be a surprising API.

So, I replaced the assignment operation with an explicit initializing

function.

* bmalloc/Heap.cpp:

(bmalloc::Heap::scavengeLargeRanges):

(bmalloc::Heap::allocateXLarge):

(bmalloc::Heap::findXLarge):

(bmalloc::Heap::deallocateXLarge):

(bmalloc::Heap::allocateLarge):

(bmalloc::Heap::deallocateLarge):

* bmalloc/Heap.h: No behavior changes here -- just adopting the

LargeObject interface.

* bmalloc/LargeObject.h: Added.

(bmalloc::LargeObject::operator!):

(bmalloc::LargeObject::begin):

(bmalloc::LargeObject::size):

(bmalloc::LargeObject::range):

(bmalloc::LargeObject::LargeObject):

(bmalloc::LargeObject::setFree):

(bmalloc::LargeObject::isFree):

(bmalloc::LargeObject::hasPhysicalPages):

(bmalloc::LargeObject::setHasPhysicalPages):

(bmalloc::LargeObject::isValidAndFree):

(bmalloc::LargeObject::merge):

(bmalloc::LargeObject::split):

(bmalloc::LargeObject::validateSelf):

(bmalloc::LargeObject::validate): Moved this code into a class, out of

BoundaryTag free functions.

New to the class are these features:

    (1) Every reference to an object is validated upon creation and use.

    (2) There's an explicit API for &quot;This is a reference to an object

    that might be stale (the DoNotValidate API)&quot;.

    (3) The begin and end tags are kept in sync automatically.

* bmalloc/SegregatedFreeList.cpp:

(bmalloc::SegregatedFreeList::insert):

(bmalloc::SegregatedFreeList::takeGreedy):

(bmalloc::SegregatedFreeList::take):

* bmalloc/SegregatedFreeList.h: Adopt the LargeObject interface.

* bmalloc/VMHeap.cpp:

(bmalloc::VMHeap::grow):

* bmalloc/VMHeap.h:

(bmalloc::VMHeap::allocateLargeRange):

(bmalloc::VMHeap::deallocateLargeRange): Adopt the LargeObject interface.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocChangeLog">releases/WebKitGTK/webkit-2.8/Source/bmalloc/ChangeLog</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocAllocatorcpp">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Allocator.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocBeginTagh">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/BeginTag.h</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocBoundaryTagh">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/BoundaryTag.h</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocBoundaryTagInlinesh">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/BoundaryTagInlines.h</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocEndTagh">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/EndTag.h</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocHeapcpp">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Heap.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocHeaph">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Heap.h</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocSegregatedFreeListcpp">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/SegregatedFreeList.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocSegregatedFreeListh">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/SegregatedFreeList.h</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocVMHeapcpp">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/VMHeap.cpp</a></li>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocVMHeaph">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/VMHeap.h</a></li>

<li><a href="#releasesWebKitGTKwebkit28Sourcebmallocbmallocxcodeprojprojectpbxproj">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc.xcodeproj/project.pbxproj</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#releasesWebKitGTKwebkit28SourcebmallocbmallocLargeObjecth">releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/LargeObject.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="releasesWebKitGTKwebkit28SourcebmallocChangeLog"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/bmalloc/ChangeLog (180828 => 180829)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/bmalloc/ChangeLog        2015-02-28 11:29:06 UTC (rev 180828)

+++ releases/WebKitGTK/webkit-2.8/Source/bmalloc/ChangeLog        2015-02-28 11:31:11 UTC (rev 180829)

</span><span class="lines">@@ -1,3 +1,98 @@

</span><ins>+2015-02-24  Geoffrey Garen  &lt;ggaren@apple.com&gt;

+

+        bmalloc: Added a little more abstraction for large objects

+        https://bugs.webkit.org/show_bug.cgi?id=141978

+

+        Reviewed by Sam Weinig.

+

+        Previously, each client needed to manage the boundary tags of

+        a large object using free functions. This patch introduces a LargeObject

+        class that does things a little more automatically.

+

+        * bmalloc.xcodeproj/project.pbxproj:

+

+        * bmalloc/Allocator.cpp:

+        (bmalloc::Allocator::reallocate): Use the new LargeObject class.

+

+        * bmalloc/BeginTag.h:

+        (bmalloc::BeginTag::isInFreeList): Deleted. Moved this logic into the

+        LargeObject class.

+

+        * bmalloc/BoundaryTag.h:

+        (bmalloc::BoundaryTag::isSentinel):

+        (bmalloc::BoundaryTag::compactBegin):

+        (bmalloc::BoundaryTag::setRange):

+        (bmalloc::BoundaryTag::initSentinel): Added an explicit API for sentinels,

+        which we used to create and test for implicitly.

+

+        * bmalloc/BoundaryTagInlines.h:

+        (bmalloc::BoundaryTag::init):

+        (bmalloc::validate): Deleted.

+        (bmalloc::validatePrev): Deleted.

+        (bmalloc::validateNext): Deleted.

+        (bmalloc::BoundaryTag::mergeLeft): Deleted.

+        (bmalloc::BoundaryTag::mergeRight): Deleted.

+        (bmalloc::BoundaryTag::merge): Deleted.

+        (bmalloc::BoundaryTag::deallocate): Deleted.

+        (bmalloc::BoundaryTag::split): Deleted.

+        (bmalloc::BoundaryTag::allocate): Deleted. Moved this logic into the

+        LargeObject class.

+

+        * bmalloc/EndTag.h:

+        (bmalloc::EndTag::init):

+        (bmalloc::EndTag::operator=): Deleted. Re-reading this code, I found

+        special behavior in the assignment operator to be a surprising API.

+        So, I replaced the assignment operation with an explicit initializing

+        function.

+

+        * bmalloc/Heap.cpp:

+        (bmalloc::Heap::scavengeLargeRanges):

+        (bmalloc::Heap::allocateXLarge):

+        (bmalloc::Heap::findXLarge):

+        (bmalloc::Heap::deallocateXLarge):

+        (bmalloc::Heap::allocateLarge):

+        (bmalloc::Heap::deallocateLarge):

+        * bmalloc/Heap.h: No behavior changes here -- just adopting the

+        LargeObject interface.

+

+        * bmalloc/LargeObject.h: Added.

+        (bmalloc::LargeObject::operator!):

+        (bmalloc::LargeObject::begin):

+        (bmalloc::LargeObject::size):

+        (bmalloc::LargeObject::range):

+        (bmalloc::LargeObject::LargeObject):

+        (bmalloc::LargeObject::setFree):

+        (bmalloc::LargeObject::isFree):

+        (bmalloc::LargeObject::hasPhysicalPages):

+        (bmalloc::LargeObject::setHasPhysicalPages):

+        (bmalloc::LargeObject::isValidAndFree):

+        (bmalloc::LargeObject::merge):

+        (bmalloc::LargeObject::split):

+        (bmalloc::LargeObject::validateSelf):

+        (bmalloc::LargeObject::validate): Moved this code into a class, out of

+        BoundaryTag free functions.

+

+        New to the class are these features:

+

+            (1) Every reference to an object is validated upon creation and use.

+

+            (2) There's an explicit API for &quot;This is a reference to an object

+            that might be stale (the DoNotValidate API)&quot;.

+

+            (3) The begin and end tags are kept in sync automatically.

+

+        * bmalloc/SegregatedFreeList.cpp:

+        (bmalloc::SegregatedFreeList::insert):

+        (bmalloc::SegregatedFreeList::takeGreedy):

+        (bmalloc::SegregatedFreeList::take):

+        * bmalloc/SegregatedFreeList.h: Adopt the LargeObject interface.

+

+        * bmalloc/VMHeap.cpp:

+        (bmalloc::VMHeap::grow):

+        * bmalloc/VMHeap.h:

+        (bmalloc::VMHeap::allocateLargeRange):

+        (bmalloc::VMHeap::deallocateLargeRange): Adopt the LargeObject interface.

+

</ins><span class="cx"> 2015-02-20  Geoffrey Garen  &lt;ggaren@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         bmalloc should implement malloc introspection (to stop false-positive leaks when MallocStackLogging is off)

</span></span></pre></div>

<a id="releasesWebKitGTKwebkit28SourcebmallocbmallocAllocatorcpp"></a>

<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Allocator.cpp (180828 => 180829)</h4>

<pre class="diff"><span>

<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Allocator.cpp        2015-02-28 11:29:06 UTC (rev 180828)

+++ releases/WebKitGTK/webkit-2.8/Source/bmalloc/bmalloc/Allocator.cpp        2015-02-28 11:31:11 UTC (rev 180829)

</span><span class="lines">@@ -1,5 +1,5 @@

</span><span class="cx"> /*