<!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>[204917] trunk/Source</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/204917">204917</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2016-08-24 12:23:47 -0700 (Wed, 24 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/bmalloc:
Add bmalloc::api::isEnabled().
<https://webkit.org/b/160534>
Reviewed by Joseph Pecoraro.
* bmalloc/bmalloc.h:
(bmalloc::api::isEnabled):
Source/WebCore:
Leaks bot hits an assertion in ResourceUsageThread::platformThreadBody
<https://webkit.org/b/160534>
Reviewed by Joseph Pecoraro.
Use the correct malloc bucket when bmalloc is disabled (which is the case on leaks bots.)
* page/cocoa/ResourceUsageThreadCocoa.mm:
(WebCore::ResourceUsageThread::platformThreadBody):
Source/WTF:
Add WTF::isFastMallocEnabled().
<https://webkit.org/b/160534>
Reviewed by Joseph Pecoraro.
* wtf/FastMalloc.cpp:
(WTF::isFastMallocEnabled):
* wtf/FastMalloc.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloccpp">trunk/Source/WTF/wtf/FastMalloc.cpp</a></li>
<li><a href="#trunkSourceWTFwtfFastMalloch">trunk/Source/WTF/wtf/FastMalloc.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagecocoaResourceUsageThreadCocoamm">trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm</a></li>
<li><a href="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocbmalloch">trunk/Source/bmalloc/bmalloc/bmalloc.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (204916 => 204917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-08-24 19:14:28 UTC (rev 204916)
+++ trunk/Source/WTF/ChangeLog 2016-08-24 19:23:47 UTC (rev 204917)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-24 Andreas Kling <akling@apple.com>
+
+ Add WTF::isFastMallocEnabled().
+ <https://webkit.org/b/160534>
+
+ Reviewed by Joseph Pecoraro.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::isFastMallocEnabled):
+ * wtf/FastMalloc.h:
+
</ins><span class="cx"> 2016-08-23 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add enum traits and use them in the IPC::Decoder
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (204916 => 204917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.cpp 2016-08-24 19:14:28 UTC (rev 204916)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2016-08-24 19:23:47 UTC (rev 204917)
</span><span class="lines">@@ -81,6 +81,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+bool isFastMallocEnabled()
+{
+ return false;
+}
+
</ins><span class="cx"> size_t fastMallocGoodSize(size_t bytes)
</span><span class="cx"> {
</span><span class="cx"> #if OS(DARWIN)
</span><span class="lines">@@ -188,6 +193,11 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><ins>+bool isFastMallocEnabled()
+{
+ return bmalloc::api::isEnabled();
+}
+
</ins><span class="cx"> void* fastMalloc(size_t size)
</span><span class="cx"> {
</span><span class="cx"> return bmalloc::api::malloc(size);
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.h (204916 => 204917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.h 2016-08-24 19:14:28 UTC (rev 204916)
+++ trunk/Source/WTF/wtf/FastMalloc.h 2016-08-24 19:23:47 UTC (rev 204917)
</span><span class="lines">@@ -38,6 +38,8 @@
</span><span class="cx"> mutable void* m_data;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+WTF_EXPORT_PRIVATE bool isFastMallocEnabled();
+
</ins><span class="cx"> // These functions call CRASH() if an allocation fails.
</span><span class="cx"> WTF_EXPORT_PRIVATE void* fastMalloc(size_t);
</span><span class="cx"> WTF_EXPORT_PRIVATE void* fastZeroedMalloc(size_t);
</span><span class="lines">@@ -99,6 +101,7 @@
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><span class="cx">
</span><ins>+using WTF::isFastMallocEnabled;
</ins><span class="cx"> using WTF::fastCalloc;
</span><span class="cx"> using WTF::fastFree;
</span><span class="cx"> using WTF::fastMalloc;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204916 => 204917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-24 19:14:28 UTC (rev 204916)
+++ trunk/Source/WebCore/ChangeLog 2016-08-24 19:23:47 UTC (rev 204917)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-24 Andreas Kling <akling@apple.com>
+
+ Leaks bot hits an assertion in ResourceUsageThread::platformThreadBody
+ <https://webkit.org/b/160534>
+
+ Reviewed by Joseph Pecoraro.
+
+ Use the correct malloc bucket when bmalloc is disabled (which is the case on leaks bots.)
+
+ * page/cocoa/ResourceUsageThreadCocoa.mm:
+ (WebCore::ResourceUsageThread::platformThreadBody):
+
</ins><span class="cx"> 2016-08-24 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, roll out r204901, r204897, r204866, r204856, r204854.
</span></span></pre></div>
<a id="trunkSourceWebCorepagecocoaResourceUsageThreadCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm (204916 => 204917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm 2016-08-24 19:14:28 UTC (rev 204916)
+++ trunk/Source/WebCore/page/cocoa/ResourceUsageThreadCocoa.mm 2016-08-24 19:23:47 UTC (rev 204917)
</span><span class="lines">@@ -227,11 +227,15 @@
</span><span class="cx"> data.categories[MemoryCategory::GCOwned].dirtySize = currentGCOwnedExtra - currentGCOwnedExternal;
</span><span class="cx"> data.categories[MemoryCategory::GCOwned].externalSize = currentGCOwnedExternal;
</span><span class="cx">
</span><del>- // Subtract known subchunks from the bmalloc bucket.
- // FIXME: Handle running with bmalloc disabled.
- size_t currentGCOwnedGenerallyInBmalloc = currentGCOwnedExtra - currentGCOwnedExternal;
- ASSERT(currentGCOwnedGenerallyInBmalloc < data.categories[MemoryCategory::bmalloc].dirtySize);
- data.categories[MemoryCategory::bmalloc].dirtySize -= currentGCHeapCapacity + currentGCOwnedGenerallyInBmalloc;
</del><ins>+ // Subtract known subchunks from the appropriate malloc bucket.
+ size_t currentGCOwnedGenerallyInMalloc = currentGCOwnedExtra - currentGCOwnedExternal;
+ if (isFastMallocEnabled()) {
+ RELEASE_ASSERT(currentGCOwnedGenerallyInMalloc < data.categories[MemoryCategory::bmalloc].dirtySize);
+ data.categories[MemoryCategory::bmalloc].dirtySize -= currentGCHeapCapacity + currentGCOwnedGenerallyInMalloc;
+ } else {
+ RELEASE_ASSERT(currentGCOwnedGenerallyInMalloc < data.categories[MemoryCategory::LibcMalloc].dirtySize);
+ data.categories[MemoryCategory::LibcMalloc].dirtySize -= currentGCHeapCapacity + currentGCOwnedGenerallyInMalloc;
+ }
</ins><span class="cx">
</span><span class="cx"> data.totalExternalSize = currentGCOwnedExternal;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (204916 => 204917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2016-08-24 19:14:28 UTC (rev 204916)
+++ trunk/Source/bmalloc/ChangeLog 2016-08-24 19:23:47 UTC (rev 204917)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-24 Andreas Kling <akling@apple.com>
+
+ Add bmalloc::api::isEnabled().
+ <https://webkit.org/b/160534>
+
+ Reviewed by Joseph Pecoraro.
+
+ * bmalloc/bmalloc.h:
+ (bmalloc::api::isEnabled):
+
</ins><span class="cx"> 2016-08-24 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, roll out r204901, r204897, r204866, r204856, r204854.
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocbmalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/bmalloc.h (204916 => 204917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/bmalloc.h 2016-08-24 19:14:28 UTC (rev 204916)
+++ trunk/Source/bmalloc/bmalloc/bmalloc.h 2016-08-24 19:23:47 UTC (rev 204917)
</span><span class="lines">@@ -73,5 +73,11 @@
</span><span class="cx"> PerProcess<Heap>::get()->scavenge(lock, std::chrono::milliseconds(0));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline bool isEnabled()
+{
+ std::unique_lock<StaticMutex> lock(PerProcess<Heap>::mutex());
+ return PerProcess<Heap>::getFastCase()->environment().isBmallocEnabled();
+}
+
</ins><span class="cx"> } // namespace api
</span><span class="cx"> } // namespace bmalloc
</span></span></pre>
</div>
</div>
</body>
</html>