<!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>[173908] 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/173908">173908</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-09-23 22:07:19 -0700 (Tue, 23 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>2014-09-23 Geoffrey Garen <ggaren@apple.com>
Rolled out <a href="http://trac.webkit.org/projects/webkit/changeset/173346">r173346</a>.
bmalloc should honor the FastMalloc statistics API
https://bugs.webkit.org/show_bug.cgi?id=136592
This didn't really work. Because we allow ranges with and without
physical pages to merge, and we allow double-committing and
double-decommitting, we can't rely on commit actions to track memory
footprint.
* bmalloc/Heap.cpp:
(bmalloc::Heap::size): Deleted.
(bmalloc::Heap::capacity): Deleted.
* bmalloc/Heap.h:
* bmalloc/VMHeap.cpp:
(bmalloc::VMHeap::VMHeap):
(bmalloc::VMHeap::allocateSmallChunk):
(bmalloc::VMHeap::allocateMediumChunk):
(bmalloc::VMHeap::allocateLargeChunk):
* bmalloc/VMHeap.h:
(bmalloc::VMHeap::allocateSmallPage):
(bmalloc::VMHeap::allocateMediumPage):
(bmalloc::VMHeap::allocateLargeRange):
(bmalloc::VMHeap::deallocateSmallPage):
(bmalloc::VMHeap::deallocateMediumPage):
(bmalloc::VMHeap::deallocateLargeRange):
(bmalloc::VMHeap::size): Deleted.
(bmalloc::VMHeap::capacity): Deleted.
* bmalloc/bmalloc.h:
(bmalloc::api::heapSize): Deleted.
(bmalloc::api::heapCapacity): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocHeapcpp">trunk/Source/bmalloc/bmalloc/Heap.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocHeaph">trunk/Source/bmalloc/bmalloc/Heap.h</a></li>
<li><a href="#trunkSourcebmallocbmallocVMHeapcpp">trunk/Source/bmalloc/bmalloc/VMHeap.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocVMHeaph">trunk/Source/bmalloc/bmalloc/VMHeap.h</a></li>
<li><a href="#trunkSourcebmallocbmallocbmalloch">trunk/Source/bmalloc/bmalloc/bmalloc.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (173907 => 173908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/ChangeLog 2014-09-24 05:07:19 UTC (rev 173908)
</span><span class="lines">@@ -1,5 +1,39 @@
</span><span class="cx"> 2014-09-23 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ Rolled out r173346.
+
+ bmalloc should honor the FastMalloc statistics API
+ https://bugs.webkit.org/show_bug.cgi?id=136592
+
+ This didn't really work. Because we allow ranges with and without
+ physical pages to merge, and we allow double-committing and
+ double-decommitting, we can't rely on commit actions to track memory
+ footprint.
+
+ * bmalloc/Heap.cpp:
+ (bmalloc::Heap::size): Deleted.
+ (bmalloc::Heap::capacity): Deleted.
+ * bmalloc/Heap.h:
+ * bmalloc/VMHeap.cpp:
+ (bmalloc::VMHeap::VMHeap):
+ (bmalloc::VMHeap::allocateSmallChunk):
+ (bmalloc::VMHeap::allocateMediumChunk):
+ (bmalloc::VMHeap::allocateLargeChunk):
+ * bmalloc/VMHeap.h:
+ (bmalloc::VMHeap::allocateSmallPage):
+ (bmalloc::VMHeap::allocateMediumPage):
+ (bmalloc::VMHeap::allocateLargeRange):
+ (bmalloc::VMHeap::deallocateSmallPage):
+ (bmalloc::VMHeap::deallocateMediumPage):
+ (bmalloc::VMHeap::deallocateLargeRange):
+ (bmalloc::VMHeap::size): Deleted.
+ (bmalloc::VMHeap::capacity): Deleted.
+ * bmalloc/bmalloc.h:
+ (bmalloc::api::heapSize): Deleted.
+ (bmalloc::api::heapCapacity): Deleted.
+
+2014-09-23 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> bmalloc: Allocation should be more precise
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=136993
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (173907 => 173908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2014-09-24 05:07:19 UTC (rev 173908)
</span><span class="lines">@@ -369,14 +369,4 @@
</span><span class="cx"> m_scavenger.run();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-size_t Heap::size(std::lock_guard<StaticMutex>&)
-{
- return m_vmHeap.capacity() - m_vmHeap.size();
-}
-
-size_t Heap::capacity(std::lock_guard<StaticMutex>&)
-{
- return m_vmHeap.capacity();
-}
-
</del><span class="cx"> } // namespace bmalloc
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.h (173907 => 173908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.h 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/bmalloc/Heap.h 2014-09-24 05:07:19 UTC (rev 173908)
</span><span class="lines">@@ -64,9 +64,6 @@
</span><span class="cx">
</span><span class="cx"> void scavenge(std::unique_lock<StaticMutex>&, std::chrono::milliseconds sleepDuration);
</span><span class="cx">
</span><del>- size_t size(std::lock_guard<StaticMutex>&);
- size_t capacity(std::lock_guard<StaticMutex>&);
-
</del><span class="cx"> private:
</span><span class="cx"> ~Heap() = delete;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocVMHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/VMHeap.cpp (173907 => 173908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/bmalloc/VMHeap.cpp 2014-09-24 05:07:19 UTC (rev 173908)
</span><span class="lines">@@ -33,8 +33,6 @@
</span><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span><span class="cx"> VMHeap::VMHeap()
</span><del>- : m_size(0)
- , m_capacity(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -43,9 +41,6 @@
</span><span class="cx"> SmallChunk* chunk = SmallChunk::create();
</span><span class="cx"> for (auto* it = chunk->begin(); it != chunk->end(); ++it)
</span><span class="cx"> m_smallPages.push(it);
</span><del>-
- m_size += smallChunkSize;
- m_capacity += smallChunkSize;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void VMHeap::allocateMediumChunk()
</span><span class="lines">@@ -53,20 +48,12 @@
</span><span class="cx"> MediumChunk* chunk = MediumChunk::create();
</span><span class="cx"> for (auto* it = chunk->begin(); it != chunk->end(); ++it)
</span><span class="cx"> m_mediumPages.push(it);
</span><del>-
- m_size += mediumChunkSize;
- m_capacity += mediumChunkSize;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Range VMHeap::allocateLargeChunk()
</span><span class="cx"> {
</span><span class="cx"> LargeChunk* chunk = LargeChunk::create();
</span><del>- Range result = BoundaryTag::init(chunk);
-
- m_size += largeChunkSize;
- m_capacity += largeChunkSize;
-
- return result;
</del><ins>+ return BoundaryTag::init(chunk);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace bmalloc
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocVMHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/VMHeap.h (173907 => 173908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/VMHeap.h 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/bmalloc/VMHeap.h 2014-09-24 05:07:19 UTC (rev 173908)
</span><span class="lines">@@ -45,9 +45,6 @@
</span><span class="cx"> public:
</span><span class="cx"> VMHeap();
</span><span class="cx">
</span><del>- size_t size() { return m_size; }
- size_t capacity() { return m_capacity; }
-
</del><span class="cx"> SmallPage* allocateSmallPage();
</span><span class="cx"> MediumPage* allocateMediumPage();
</span><span class="cx"> Range allocateLargeRange(size_t);
</span><span class="lines">@@ -61,9 +58,6 @@
</span><span class="cx"> void allocateMediumChunk();
</span><span class="cx"> Range allocateLargeChunk();
</span><span class="cx">
</span><del>- size_t m_size;
- size_t m_capacity;
-
</del><span class="cx"> Vector<SmallPage*> m_smallPages;
</span><span class="cx"> Vector<MediumPage*> m_mediumPages;
</span><span class="cx"> SegregatedFreeList m_largeRanges;
</span><span class="lines">@@ -74,7 +68,6 @@
</span><span class="cx"> if (!m_smallPages.size())
</span><span class="cx"> allocateSmallChunk();
</span><span class="cx">
</span><del>- m_size -= vmPageSize;
</del><span class="cx"> return m_smallPages.pop();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -83,7 +76,6 @@
</span><span class="cx"> if (!m_mediumPages.size())
</span><span class="cx"> allocateMediumChunk();
</span><span class="cx">
</span><del>- m_size -= vmPageSize;
</del><span class="cx"> return m_mediumPages.pop();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -92,7 +84,6 @@
</span><span class="cx"> Range range = m_largeRanges.take(size);
</span><span class="cx"> if (!range)
</span><span class="cx"> range = allocateLargeChunk();
</span><del>- m_size -= range.size();
</del><span class="cx"> return range;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -102,7 +93,6 @@
</span><span class="cx"> vmDeallocatePhysicalPages(page->begin()->begin(), vmPageSize);
</span><span class="cx"> lock.lock();
</span><span class="cx">
</span><del>- m_size += vmPageSize;
</del><span class="cx"> m_smallPages.push(page);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -112,7 +102,6 @@
</span><span class="cx"> vmDeallocatePhysicalPages(page->begin()->begin(), vmPageSize);
</span><span class="cx"> lock.lock();
</span><span class="cx">
</span><del>- m_size += vmPageSize;
</del><span class="cx"> m_mediumPages.push(page);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -136,7 +125,6 @@
</span><span class="cx"> beginTag->setHasPhysicalPages(false);
</span><span class="cx"> endTag->setHasPhysicalPages(false);
</span><span class="cx">
</span><del>- m_size += range.size();
</del><span class="cx"> m_largeRanges.insert(range);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocbmalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/bmalloc.h (173907 => 173908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/bmalloc.h 2014-09-24 03:31:50 UTC (rev 173907)
+++ trunk/Source/bmalloc/bmalloc/bmalloc.h 2014-09-24 05:07:19 UTC (rev 173908)
</span><span class="lines">@@ -87,17 +87,5 @@
</span><span class="cx"> PerProcess<Heap>::get()->scavenge(lock, std::chrono::milliseconds(0));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline size_t heapSize()
-{
- std::lock_guard<StaticMutex> lock(PerProcess<Heap>::mutex());
- return PerProcess<Heap>::get()->size(lock);
-}
-
-inline size_t heapCapacity()
-{
- std::lock_guard<StaticMutex> lock(PerProcess<Heap>::mutex());
- return PerProcess<Heap>::get()->capacity(lock);
-}
-
</del><span class="cx"> } // namespace api
</span><span class="cx"> } // namespace bmalloc
</span></span></pre>
</div>
</div>
</body>
</html>