<!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>[179412] 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/179412">179412</a></dd>
<dt>Author</dt> <dd>ggaren@apple.com</dd>
<dt>Date</dt> <dd>2015-01-30 14:27:56 -0800 (Fri, 30 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>GC marking threads should clear malloc caches
https://bugs.webkit.org/show_bug.cgi?id=141097
Reviewed by Andreas Kling.
Split the scavenging API into per-thread vs global, so that you can
request to scavenge your own thread without scavenging the whole heap.
Source/bmalloc:
* bmalloc/Cache.cpp:
(bmalloc::Cache::scavenge):
* bmalloc/bmalloc.h:
(bmalloc::api::scavengeThisThread):
(bmalloc::api::scavenge):
Source/WTF:
* wtf/FastMalloc.cpp:
(WTF::releaseFastMallocFreeMemoryForThisThread):
(WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
* 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="#trunkSourcebmallocChangeLog">trunk/Source/bmalloc/ChangeLog</a></li>
<li><a href="#trunkSourcebmallocbmallocCachecpp">trunk/Source/bmalloc/bmalloc/Cache.cpp</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 (179411 => 179412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-01-30 22:22:57 UTC (rev 179411)
+++ trunk/Source/WTF/ChangeLog 2015-01-30 22:27:56 UTC (rev 179412)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-01-30 Geoffrey Garen <ggaren@apple.com>
+
+ GC marking threads should clear malloc caches
+ https://bugs.webkit.org/show_bug.cgi?id=141097
+
+ Reviewed by Andreas Kling.
+
+ Split the scavenging API into per-thread vs global, so that you can
+ request to scavenge your own thread without scavenging the whole heap.
+
+ * wtf/FastMalloc.cpp:
+ (WTF::releaseFastMallocFreeMemoryForThisThread):
+ (WTF::TCMalloc_ThreadCache::CreateCacheIfNecessary):
+ * wtf/FastMalloc.h:
+
</ins><span class="cx"> 2015-01-30 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> OSObjectPtr does not work with dispatch_data_t on Maverics
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.cpp (179411 => 179412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.cpp 2015-01-30 22:22:57 UTC (rev 179411)
+++ trunk/Source/WTF/wtf/FastMalloc.cpp 2015-01-30 22:27:56 UTC (rev 179412)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> // Copyright (c) 2005, 2007, Google Inc.
</span><span class="cx"> // All rights reserved.
</span><del>-// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011 Apple Inc. All rights reserved.
</del><ins>+// Copyright (C) 2005, 2006, 2007, 2008, 2009, 2011, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> //
</span><span class="cx"> // Redistribution and use in source and binary forms, with or without
</span><span class="cx"> // modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -209,6 +209,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void releaseFastMallocFreeMemory() { }
</span><ins>+void releaseFastMallocFreeMemoryForThisThread() { }
</ins><span class="cx">
</span><span class="cx"> FastMallocStatistics fastMallocStatistics()
</span><span class="cx"> {
</span><span class="lines">@@ -287,6 +288,11 @@
</span><span class="cx"> return fastCalloc(numElements, elementSize);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void releaseFastMallocFreeMemoryForThisThread()
+{
+ bmalloc::api::scavengeThisThread();
+}
+
</ins><span class="cx"> void releaseFastMallocFreeMemory()
</span><span class="cx"> {
</span><span class="cx"> bmalloc::api::scavenge();
</span><span class="lines">@@ -4483,12 +4489,16 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifdef WTF_CHANGES
</span><del>-void releaseFastMallocFreeMemory()
</del><ins>+void releaseFastMallocFreeMemoryForThisThread()
</ins><span class="cx"> {
</span><del>- // Flush free pages in the current thread cache back to the page heap.
</del><span class="cx"> if (TCMalloc_ThreadCache* threadCache = TCMalloc_ThreadCache::GetCacheIfPresent())
</span><span class="cx"> threadCache->Cleanup();
</span><ins>+}
</ins><span class="cx">
</span><ins>+void releaseFastMallocFreeMemory()
+{
+ releaseFastMallocFreeMemoryForThisThread();
+
</ins><span class="cx"> SpinLockHolder h(&pageheap_lock);
</span><span class="cx"> pageheap->ReleaseFreePages();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWTFwtfFastMalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/FastMalloc.h (179411 => 179412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/FastMalloc.h 2015-01-30 22:22:57 UTC (rev 179411)
+++ trunk/Source/WTF/wtf/FastMalloc.h 2015-01-30 22:27:56 UTC (rev 179412)
</span><span class="lines">@@ -77,6 +77,7 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE void fastFree(void*);
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE void releaseFastMallocFreeMemory();
</span><ins>+ WTF_EXPORT_PRIVATE void releaseFastMallocFreeMemoryForThisThread();
</ins><span class="cx">
</span><span class="cx"> struct FastMallocStatistics {
</span><span class="cx"> size_t reservedVMBytes;
</span></span></pre></div>
<a id="trunkSourcebmallocChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/ChangeLog (179411 => 179412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/ChangeLog 2015-01-30 22:22:57 UTC (rev 179411)
+++ trunk/Source/bmalloc/ChangeLog 2015-01-30 22:27:56 UTC (rev 179412)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-30 Geoffrey Garen <ggaren@apple.com>
+
+ GC marking threads should clear malloc caches
+ https://bugs.webkit.org/show_bug.cgi?id=141097
+
+ Reviewed by Andreas Kling.
+
+ Split the scavenging API into per-thread vs global, so that you can
+ request to scavenge your own thread without scavenging the whole heap.
+
+ * bmalloc/Cache.cpp:
+ (bmalloc::Cache::scavenge):
+ * bmalloc/bmalloc.h:
+ (bmalloc::api::scavengeThisThread):
+ (bmalloc::api::scavenge):
+
</ins><span class="cx"> 2015-01-28 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Move ASan flag settings from DebugRelease.xcconfig to Base.xcconfig
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/Cache.cpp (179411 => 179412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/Cache.cpp 2015-01-30 22:22:57 UTC (rev 179411)
+++ trunk/Source/bmalloc/bmalloc/Cache.cpp 2015-01-30 22:27:56 UTC (rev 179412)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -48,9 +48,6 @@
</span><span class="cx">
</span><span class="cx"> cache->allocator().scavenge();
</span><span class="cx"> cache->deallocator().scavenge();
</span><del>-
- std::unique_lock<StaticMutex> lock(PerProcess<Heap>::mutex());
- PerProcess<Heap>::get()->scavenge(lock, std::chrono::milliseconds(0));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Cache::Cache()
</span></span></pre></div>
<a id="trunkSourcebmallocbmallocbmalloch"></a>
<div class="modfile"><h4>Modified: trunk/Source/bmalloc/bmalloc/bmalloc.h (179411 => 179412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/bmalloc/bmalloc/bmalloc.h 2015-01-30 22:22:57 UTC (rev 179411)
+++ trunk/Source/bmalloc/bmalloc/bmalloc.h 2015-01-30 22:27:56 UTC (rev 179412)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2014 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2014, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -24,6 +24,9 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "Cache.h"
</span><ins>+#include "Heap.h"
+#include "PerProcess.h"
+#include "StaticMutex.h"
</ins><span class="cx">
</span><span class="cx"> namespace bmalloc {
</span><span class="cx"> namespace api {
</span><span class="lines">@@ -47,11 +50,19 @@
</span><span class="cx"> {
</span><span class="cx"> return Cache::reallocate(object, newSize);
</span><span class="cx"> }
</span><del>-
-inline void scavenge()
</del><ins>+
+inline void scavengeThisThread()
</ins><span class="cx"> {
</span><span class="cx"> Cache::scavenge();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline void scavenge()
+{
+ scavengeThisThread();
+
+ std::unique_lock<StaticMutex> lock(PerProcess<Heap>::mutex());
+ PerProcess<Heap>::get()->scavenge(lock, std::chrono::milliseconds(0));
+}
+
</ins><span class="cx"> } // namespace api
</span><span class="cx"> } // namespace bmalloc
</span></span></pre>
</div>
</div>
</body>
</html>