<!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>[167292] trunk</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/167292">167292</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2014-04-14 20:52:39 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>MallocBench should scavenge explicitly instead of waiting
https://bugs.webkit.org/show_bug.cgi?id=131661
Reviewed by Andreas Kling.
PerformanceTests:
* MallocBench/MallocBench.xcodeproj/project.pbxproj: Don't build mbmalloc
by default because it will overwrite any other mbmalloc you're working
with in the WebKitBuild directory.
* MallocBench/MallocBench/Benchmark.cpp:
(Benchmark::run): Scavenge explicitly instead of waiting. This is faster,
and it's the only way to get FastMalloc to scavenge. (That's a bug in
FastMalloc, but we don't want it to interfere with broader testing.)
* MallocBench/MallocBench/mbmalloc.cpp:
* MallocBench/MallocBench/mbmalloc.h: Added a scavenge implementation
for system malloc.
Source/bmalloc:
Added explicit scavenge support to bmalloc. This isn't a memory win,
since bmalloc's per-thread cache is so small. But it makes testing
simpler.
* bmalloc/Allocator.cpp:
(bmalloc::Allocator::~Allocator):
(bmalloc::Allocator::scavenge):
* bmalloc/Allocator.h:
* bmalloc/Cache.cpp:
(bmalloc::Cache::operator new):
(bmalloc::Cache::operator delete):
(bmalloc::Cache::Cache):
(bmalloc::Cache::scavenge):
* bmalloc/Cache.h:
* bmalloc/Deallocator.cpp:
(bmalloc::Deallocator::~Deallocator):
(bmalloc::Deallocator::scavenge):
* bmalloc/Deallocator.h: Factored existing scavenging code into helper
functions, for reuse.
* bmalloc/Heap.cpp:
(bmalloc::sleep):
(bmalloc::Heap::concurrentScavenge):
(bmalloc::Heap::scavenge):
(bmalloc::Heap::scavengeSmallPages):
(bmalloc::Heap::scavengeMediumPages):
(bmalloc::Heap::scavengeLargeRanges):
* bmalloc/Heap.h: Made scavenge sleep duration a parameter. Forced
scavenging -- in response to a benchmark or a low memory warning --
wants to complete as soon as possible, so its sleep duration is 0.
* bmalloc/bmalloc.h:
(bmalloc::api::scavenge):
* bmalloc/mbmalloc.cpp: Exported the scavenge API for MallocBench's use.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkPerformanceTestsChangeLog">trunk/PerformanceTests/ChangeLog</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchBenchmarkcpp">trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchmbmalloccpp">trunk/PerformanceTests/MallocBench/MallocBench/mbmalloc.cpp</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchmbmalloch">trunk/PerformanceTests/MallocBench/MallocBench/mbmalloc.h</a></li>
<li><a href="#trunkPerformanceTestsMallocBenchMallocBenchxcodeprojprojectpbxproj">trunk/PerformanceTests/MallocBench/MallocBench.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocAllocatorcpp">trunk/Source/bmalloc/bmalloc/Allocator.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocAllocatorh">trunk/Source/bmalloc/bmalloc/Allocator.h</a></li>
<li><a href="#trunkSourcebmallocbmallocCachecpp">trunk/Source/bmalloc/bmalloc/Cache.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocCacheh">trunk/Source/bmalloc/bmalloc/Cache.h</a></li>
<li><a href="#trunkSourcebmallocbmallocDeallocatorcpp">trunk/Source/bmalloc/bmalloc/Deallocator.cpp</a></li>
<li><a href="#trunkSourcebmallocbmallocDeallocatorh">trunk/Source/bmalloc/bmalloc/Deallocator.h</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="#trunkSourcebmallocbmallocbmalloch">trunk/Source/bmalloc/bmalloc/bmalloc.h</a></li>
<li><a href="#trunkSourcebmallocbmallocmbmalloccpp">trunk/Source/bmalloc/bmalloc/mbmalloc.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkPerformanceTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/ChangeLog (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/ChangeLog 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/PerformanceTests/ChangeLog 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2014-04-14 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ MallocBench should scavenge explicitly instead of waiting
+ https://bugs.webkit.org/show_bug.cgi?id=131661
+
+ Reviewed by Andreas Kling.
+
+ * MallocBench/MallocBench.xcodeproj/project.pbxproj: Don't build mbmalloc
+ by default because it will overwrite any other mbmalloc you're working
+ with in the WebKitBuild directory.
+
+ * MallocBench/MallocBench/Benchmark.cpp:
+ (Benchmark::run): Scavenge explicitly instead of waiting. This is faster,
+ and it's the only way to get FastMalloc to scavenge. (That's a bug in
+ FastMalloc, but we don't want it to interfere with broader testing.)
+
+ * MallocBench/MallocBench/mbmalloc.cpp:
+ * MallocBench/MallocBench/mbmalloc.h: Added a scavenge implementation
+ for system malloc.
+
+2014-04-14 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> A few MallocBench record/replay fixes
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131627
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchBenchmarkcpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/PerformanceTests/MallocBench/MallocBench/Benchmark.cpp 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -184,14 +184,8 @@
</span><span class="cx">
</span><span class="cx"> if (!m_measureHeap)
</span><span class="cx"> return;
</span><del>-
- // Wait a bit for any async freeing to finish.
- size_t last;
- do {
- last = currentMemoryBytes().resident;
- std::this_thread::sleep_for(std::chrono::seconds(2));
- } while (currentMemoryBytes().resident < last);
-
</del><ins>+
+ mbscavenge();
</ins><span class="cx"> m_memory = currentMemoryBytes();
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchmbmalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/mbmalloc.cpp (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/mbmalloc.cpp 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/PerformanceTests/MallocBench/MallocBench/mbmalloc.cpp 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> #include <limits>
</span><span class="cx"> #include <stdio.h>
</span><span class="cx"> #include <stdlib.h>
</span><ins>+#import <malloc/malloc.h>
</ins><span class="cx">
</span><span class="cx"> extern "C" {
</span><span class="cx">
</span><span class="lines">@@ -44,4 +45,9 @@
</span><span class="cx"> return realloc(p, newSize);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void mbscavenge()
+{
+ malloc_zone_pressure_relief(nullptr, 0);
+}
+
</ins><span class="cx"> } // extern "C"
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchmbmalloch"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench/mbmalloc.h (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench/mbmalloc.h 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/PerformanceTests/MallocBench/MallocBench/mbmalloc.h 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -37,7 +37,8 @@
</span><span class="cx"> void* mbmalloc(size_t);
</span><span class="cx"> void mbfree(void*, size_t);
</span><span class="cx"> void* mbrealloc(void*, size_t, size_t);
</span><del>-
</del><ins>+void mbscavenge();
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Catch accidental benchmark allocation through malloc and free. All benchmark
</span></span></pre></div>
<a id="trunkPerformanceTestsMallocBenchMallocBenchxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/PerformanceTests/MallocBench/MallocBench.xcodeproj/project.pbxproj (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/PerformanceTests/MallocBench/MallocBench.xcodeproj/project.pbxproj 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/PerformanceTests/MallocBench/MallocBench.xcodeproj/project.pbxproj 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -37,16 +37,6 @@
</span><span class="cx"> 14E11932177ECC8B003A8D15 /* CPUCount.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 14E11930177ECC8B003A8D15 /* CPUCount.cpp */; };
</span><span class="cx"> /* End PBXBuildFile section */
</span><span class="cx">
</span><del>-/* Begin PBXContainerItemProxy section */
- 14CC393D18EA813F004AFE34 /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = 14452CA1177D24460097E057 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 14CC393718EA811F004AFE34;
- remoteInfo = mbmalloc;
- };
-/* End PBXContainerItemProxy section */
-
</del><span class="cx"> /* Begin PBXCopyFilesBuildPhase section */
</span><span class="cx"> 14452CA7177D24460097E057 /* Copy Files */ = {
</span><span class="cx"> isa = PBXCopyFilesBuildPhase;
</span><span class="lines">@@ -254,7 +244,6 @@
</span><span class="cx"> buildRules = (
</span><span class="cx"> );
</span><span class="cx"> dependencies = (
</span><del>- 14CC393E18EA813F004AFE34 /* PBXTargetDependency */,
</del><span class="cx"> );
</span><span class="cx"> name = MallocBench;
</span><span class="cx"> productName = MallocBench;
</span><span class="lines">@@ -341,14 +330,6 @@
</span><span class="cx"> };
</span><span class="cx"> /* End PBXSourcesBuildPhase section */
</span><span class="cx">
</span><del>-/* Begin PBXTargetDependency section */
- 14CC393E18EA813F004AFE34 /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- target = 14CC393718EA811F004AFE34 /* mbmalloc */;
- targetProxy = 14CC393D18EA813F004AFE34 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
</del><span class="cx"> /* Begin XCBuildConfiguration section */
</span><span class="cx"> 14452CB5177D24460097E057 /* Debug */ = {
</span><span class="cx"> isa = XCBuildConfiguration;
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/ChangeLog 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -1,5 +1,47 @@
</span><span class="cx"> 2014-04-14 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><ins>+ MallocBench should scavenge explicitly instead of waiting
+ https://bugs.webkit.org/show_bug.cgi?id=131661
+
+ Reviewed by Andreas Kling.
+
+ Added explicit scavenge support to bmalloc. This isn't a memory win,
+ since bmalloc's per-thread cache is so small. But it makes testing
+ simpler.
+
+ * bmalloc/Allocator.cpp:
+ (bmalloc::Allocator::~Allocator):
+ (bmalloc::Allocator::scavenge):
+ * bmalloc/Allocator.h:
+ * bmalloc/Cache.cpp:
+ (bmalloc::Cache::operator new):
+ (bmalloc::Cache::operator delete):
+ (bmalloc::Cache::Cache):
+ (bmalloc::Cache::scavenge):
+ * bmalloc/Cache.h:
+ * bmalloc/Deallocator.cpp:
+ (bmalloc::Deallocator::~Deallocator):
+ (bmalloc::Deallocator::scavenge):
+ * bmalloc/Deallocator.h: Factored existing scavenging code into helper
+ functions, for reuse.
+
+ * bmalloc/Heap.cpp:
+ (bmalloc::sleep):
+ (bmalloc::Heap::concurrentScavenge):
+ (bmalloc::Heap::scavenge):
+ (bmalloc::Heap::scavengeSmallPages):
+ (bmalloc::Heap::scavengeMediumPages):
+ (bmalloc::Heap::scavengeLargeRanges):
+ * bmalloc/Heap.h: Made scavenge sleep duration a parameter. Forced
+ scavenging -- in response to a benchmark or a low memory warning --
+ wants to complete as soon as possible, so its sleep duration is 0.
+
+ * bmalloc/bmalloc.h:
+ (bmalloc::api::scavenge):
+ * bmalloc/mbmalloc.cpp: Exported the scavenge API for MallocBench's use.
+
+2014-04-14 Geoffrey Garen <ggaren@apple.com>
+
</ins><span class="cx"> Use 4kB pages on Mac
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131658
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.cpp (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/Allocator.cpp 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -51,6 +51,11 @@
</span><span class="cx">
</span><span class="cx"> Allocator::~Allocator()
</span><span class="cx"> {
</span><ins>+ scavenge();
+}
+
+void Allocator::scavenge()
+{
</ins><span class="cx"> for (auto& allocator : m_smallAllocators)
</span><span class="cx"> log(allocator);
</span><span class="cx"> processSmallAllocatorLog();
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocAllocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Allocator.h (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Allocator.h 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/Allocator.h 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx"> void* allocate(size_t);
</span><span class="cx"> bool allocateFastCase(size_t, void*&);
</span><span class="cx"> void* allocateSlowCase(size_t);
</span><ins>+
+ void scavenge();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SmallAllocator& smallAllocatorFor(size_t);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Cache.cpp (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Cache.cpp 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/Cache.cpp 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -30,23 +30,29 @@
</span><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx">
</span><del>-inline void* Cache::operator new(size_t size)
</del><ins>+void* Cache::operator new(size_t size)
</ins><span class="cx"> {
</span><span class="cx"> return vmAllocate(vmSize(size));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void Cache::operator delete(void* p, size_t size)
</del><ins>+void Cache::operator delete(void* p, size_t size)
</ins><span class="cx"> {
</span><span class="cx"> vmDeallocate(p, vmSize(size));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline Cache::Cache()
</del><ins>+Cache::Cache()
</ins><span class="cx"> : m_deallocator()
</span><span class="cx"> , m_allocator(m_deallocator)
</span><span class="cx"> {
</span><span class="cx"> // Ensure that the heap exists, so Allocator and Deallocator can assume it does.
</span><span class="cx"> PerProcess<Heap>::get();
</span><span class="cx"> }
</span><ins>+
+void Cache::scavenge()
+{
+ m_allocator.scavenge();
+ m_deallocator.scavenge();
+}
</ins><span class="cx">
</span><span class="cx"> NO_INLINE void* Cache::allocateSlowCase(size_t size)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Cache.h (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Cache.h 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/Cache.h 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx">
</span><span class="cx"> Allocator& allocator() { return m_allocator; }
</span><span class="cx"> Deallocator& deallocator() { return m_deallocator; }
</span><ins>+
+ void scavenge();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> static bool allocateFastCase(size_t, void*&);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocDeallocatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Deallocator.cpp (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/Deallocator.cpp 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -47,6 +47,11 @@
</span><span class="cx">
</span><span class="cx"> Deallocator::~Deallocator()
</span><span class="cx"> {
</span><ins>+ scavenge();
+}
+
+void Deallocator::scavenge()
+{
</ins><span class="cx"> processObjectLog();
</span><span class="cx">
</span><span class="cx"> std::lock_guard<Mutex> lock(PerProcess<Heap>::mutex());
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocDeallocatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Deallocator.h (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Deallocator.h 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/Deallocator.h 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -49,7 +49,9 @@
</span><span class="cx">
</span><span class="cx"> void deallocateMediumLine(std::lock_guard<Mutex>&, MediumLine*);
</span><span class="cx"> MediumLine* allocateMediumLine();
</span><del>-
</del><ins>+
+ void scavenge();
+
</ins><span class="cx"> private:
</span><span class="cx"> void deallocateLarge(void*);
</span><span class="cx"> void deallocateXLarge(void*);
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.cpp (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.cpp 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/Heap.cpp 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -38,6 +38,9 @@
</span><span class="cx">
</span><span class="cx"> static inline void sleep(std::unique_lock<Mutex>& lock, std::chrono::milliseconds duration)
</span><span class="cx"> {
</span><ins>+ if (duration == std::chrono::milliseconds(0))
+ return;
+
</ins><span class="cx"> lock.unlock();
</span><span class="cx"> std::this_thread::sleep_for(duration);
</span><span class="cx"> lock.lock();
</span><span class="lines">@@ -52,20 +55,25 @@
</span><span class="cx"> void Heap::concurrentScavenge()
</span><span class="cx"> {
</span><span class="cx"> std::unique_lock<Mutex> lock(PerProcess<Heap>::mutex());
</span><del>- scavengeSmallPages(lock);
- scavengeMediumPages(lock);
- scavengeLargeRanges(lock);
</del><ins>+ scavenge(lock, scavengeSleepDuration);
+}
+
+void Heap::scavenge(std::unique_lock<Mutex>& lock, std::chrono::milliseconds sleepDuration)
+{
+ scavengeSmallPages(lock, sleepDuration);
+ scavengeMediumPages(lock, sleepDuration);
+ scavengeLargeRanges(lock, sleepDuration);
</ins><span class="cx">
</span><del>- sleep(lock, scavengeSleepDuration);
</del><ins>+ sleep(lock, sleepDuration);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::scavengeSmallPages(std::unique_lock<Mutex>& lock)
</del><ins>+void Heap::scavengeSmallPages(std::unique_lock<Mutex>& lock, std::chrono::milliseconds sleepDuration)
</ins><span class="cx"> {
</span><span class="cx"> while (1) {
</span><span class="cx"> if (m_isAllocatingPages) {
</span><span class="cx"> m_isAllocatingPages = false;
</span><span class="cx">
</span><del>- sleep(lock, scavengeSleepDuration);
</del><ins>+ sleep(lock, sleepDuration);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -75,13 +83,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::scavengeMediumPages(std::unique_lock<Mutex>& lock)
</del><ins>+void Heap::scavengeMediumPages(std::unique_lock<Mutex>& lock, std::chrono::milliseconds sleepDuration)
</ins><span class="cx"> {
</span><span class="cx"> while (1) {
</span><span class="cx"> if (m_isAllocatingPages) {
</span><span class="cx"> m_isAllocatingPages = false;
</span><span class="cx">
</span><del>- sleep(lock, scavengeSleepDuration);
</del><ins>+ sleep(lock, sleepDuration);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -91,13 +99,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Heap::scavengeLargeRanges(std::unique_lock<Mutex>& lock)
</del><ins>+void Heap::scavengeLargeRanges(std::unique_lock<Mutex>& lock, std::chrono::milliseconds sleepDuration)
</ins><span class="cx"> {
</span><span class="cx"> while (1) {
</span><span class="cx"> if (m_isAllocatingPages) {
</span><span class="cx"> m_isAllocatingPages = false;
</span><span class="cx">
</span><del>- sleep(lock, scavengeSleepDuration);
</del><ins>+ sleep(lock, sleepDuration);
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Heap.h (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Heap.h 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/Heap.h 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -61,6 +61,8 @@
</span><span class="cx"> void* allocateXLarge(std::lock_guard<Mutex>&, size_t);
</span><span class="cx"> void deallocateXLarge(std::lock_guard<Mutex>&, void*);
</span><span class="cx">
</span><ins>+ void scavenge(std::unique_lock<Mutex>&, std::chrono::milliseconds sleepDuration);
+
</ins><span class="cx"> private:
</span><span class="cx"> ~Heap() = delete;
</span><span class="cx">
</span><span class="lines">@@ -76,9 +78,9 @@
</span><span class="cx"> void mergeLargeRight(EndTag*&, BeginTag*&, Range&, bool& hasPhysicalPages);
</span><span class="cx">
</span><span class="cx"> void concurrentScavenge();
</span><del>- void scavengeSmallPages(std::unique_lock<Mutex>&);
- void scavengeMediumPages(std::unique_lock<Mutex>&);
- void scavengeLargeRanges(std::unique_lock<Mutex>&);
</del><ins>+ void scavengeSmallPages(std::unique_lock<Mutex>&, std::chrono::milliseconds);
+ void scavengeMediumPages(std::unique_lock<Mutex>&, std::chrono::milliseconds);
+ void scavengeLargeRanges(std::unique_lock<Mutex>&, std::chrono::milliseconds);
</ins><span class="cx">
</span><span class="cx"> Vector<SmallLine*> m_smallLines;
</span><span class="cx"> Vector<MediumLine*> m_mediumLines;
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocbmalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/bmalloc.h (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/bmalloc.h 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/bmalloc.h 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -24,7 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "Cache.h"
</span><ins>+#include "Heap.h"
</ins><span class="cx"> #include "LargeChunk.h"
</span><ins>+#include "PerProcess.h"
</ins><span class="cx"> #include "XLargeChunk.h"
</span><span class="cx"> #include "Sizes.h"
</span><span class="cx">
</span><span class="lines">@@ -78,6 +80,14 @@
</span><span class="cx"> Cache::deallocate(object);
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><ins>+
+inline void scavenge()
+{
+ PerThread<Cache>::get()->scavenge();
+
+ std::unique_lock<Mutex> lock(PerProcess<Heap>::mutex());
+ PerProcess<Heap>::get()->scavenge(lock, std::chrono::milliseconds(0));
+}
</ins><span class="cx">
</span><span class="cx"> } // namespace api
</span><span class="cx"> } // namespace bmalloc
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocmbmalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/mbmalloc.cpp (167291 => 167292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/mbmalloc.cpp 2014-04-15 03:06:21 UTC (rev 167291)
+++ trunk/Source/bmalloc/bmalloc/mbmalloc.cpp 2014-04-15 03:52:39 UTC (rev 167292)
</span><span class="lines">@@ -32,7 +32,8 @@
</span><span class="cx"> EXPORT void* mbmalloc(size_t);
</span><span class="cx"> EXPORT void mbfree(void*, size_t);
</span><span class="cx"> EXPORT void* mbrealloc(void*, size_t, size_t);
</span><del>-
</del><ins>+EXPORT void mbscavenge();
+
</ins><span class="cx"> void* mbmalloc(size_t size)
</span><span class="cx"> {
</span><span class="cx"> return bmalloc::api::malloc(size);
</span><span class="lines">@@ -48,4 +49,9 @@
</span><span class="cx"> return bmalloc::api::realloc(p, size);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void mbscavenge()
+{
+ bmalloc::api::scavenge();
+}
+
</ins><span class="cx"> } // extern "C"
</span></span></pre>
</div>
</div>
</body>
</html>