<!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>[190324] 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/190324">190324</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-09-29 13:25:42 -0700 (Tue, 29 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>ParallelHelperPool::runFunctionInParallel() shouldn't allocate, and ParallelHelperPool.h shouldn't be included everywhere
https://bugs.webkit.org/show_bug.cgi?id=149635
Reviewed by Saam Barati.
Source/JavaScriptCore:
It bugged me that this change caused a whole-world recompile. So, I changed the code so
that ParallelHelperPool.h is only included by Heap.cpp and not by Heap.h.
* heap/Heap.cpp:
(JSC::Heap::Heap):
(JSC::Heap::markRoots):
(JSC::Heap::copyBackingStores):
* heap/Heap.h:
Source/WTF:
* wtf/ParallelHelperPool.h:
(WTF::ParallelHelperClient::runFunctionInParallel): Stack-allocate the task instead of heap-allocating it.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeapcpp">trunk/Source/JavaScriptCore/heap/Heap.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreheapHeaph">trunk/Source/JavaScriptCore/heap/Heap.h</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfParallelHelperPoolh">trunk/Source/WTF/wtf/ParallelHelperPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190323 => 190324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-09-29 20:22:18 UTC (rev 190323)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-09-29 20:25:42 UTC (rev 190324)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-09-29 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ ParallelHelperPool::runFunctionInParallel() shouldn't allocate, and ParallelHelperPool.h shouldn't be included everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=149635
+
+ Reviewed by Saam Barati.
+
+ It bugged me that this change caused a whole-world recompile. So, I changed the code so
+ that ParallelHelperPool.h is only included by Heap.cpp and not by Heap.h.
+
+ * heap/Heap.cpp:
+ (JSC::Heap::Heap):
+ (JSC::Heap::markRoots):
+ (JSC::Heap::copyBackingStores):
+ * heap/Heap.h:
+
+2015-09-29 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> GC copy phase spans too many files
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149586
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.cpp (190323 => 190324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-09-29 20:22:18 UTC (rev 190323)
+++ trunk/Source/JavaScriptCore/heap/Heap.cpp 2015-09-29 20:25:42 UTC (rev 190324)
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> #include <algorithm>
</span><span class="cx"> #include <wtf/RAMSize.h>
</span><span class="cx"> #include <wtf/CurrentTime.h>
</span><ins>+#include <wtf/ParallelHelperPool.h>
</ins><span class="cx"> #include <wtf/ParallelVectorIterator.h>
</span><span class="cx"> #include <wtf/ProcessID.h>
</span><span class="cx">
</span><span class="lines">@@ -357,7 +358,7 @@
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> , m_delayedReleaseRecursionCount(0)
</span><span class="cx"> #endif
</span><del>- , m_helperClient(&heapHelperPool())
</del><ins>+ , m_helperClient(std::make_unique<ParallelHelperClient>(&heapHelperPool()))
</ins><span class="cx"> {
</span><span class="cx"> m_storageSpace.init();
</span><span class="cx"> if (Options::verifyHeap())
</span><span class="lines">@@ -547,7 +548,7 @@
</span><span class="cx">
</span><span class="cx"> m_parallelMarkersShouldExit = false;
</span><span class="cx">
</span><del>- m_helperClient.setFunction(
</del><ins>+ m_helperClient->setFunction(
</ins><span class="cx"> [this] () {
</span><span class="cx"> SlotVisitor* slotVisitor;
</span><span class="cx"> {
</span><span class="lines">@@ -604,7 +605,7 @@
</span><span class="cx"> m_parallelMarkersShouldExit = true;
</span><span class="cx"> m_markingConditionVariable.notifyAll();
</span><span class="cx"> }
</span><del>- m_helperClient.finish();
</del><ins>+ m_helperClient->finish();
</ins><span class="cx"> updateObjectCounts(gcStartTime);
</span><span class="cx"> resetVisitors();
</span><span class="cx"> }
</span><span class="lines">@@ -637,7 +638,7 @@
</span><span class="cx"> // that other threads run. That's because after runFunctionInParallel() returns, the task
</span><span class="cx"> // we have created is not going to be running anymore. Hence, everything on the stack here
</span><span class="cx"> // outlives the task.
</span><del>- m_helperClient.runFunctionInParallel(
</del><ins>+ m_helperClient->runFunctionInParallel(
</ins><span class="cx"> [&] () {
</span><span class="cx"> CopyVisitor copyVisitor(*this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreheapHeaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/heap/Heap.h (190323 => 190324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/heap/Heap.h 2015-09-29 20:22:18 UTC (rev 190323)
+++ trunk/Source/JavaScriptCore/heap/Heap.h 2015-09-29 20:25:42 UTC (rev 190324)
</span><span class="lines">@@ -45,8 +45,12 @@
</span><span class="cx"> #include "WriteBarrierSupport.h"
</span><span class="cx"> #include <wtf/HashCountedSet.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><del>-#include <wtf/ParallelHelperPool.h>
</del><span class="cx">
</span><ins>+namespace WTF {
+class ParallelHelperClient;
+}
+using WTF::ParallelHelperClient;
+
</ins><span class="cx"> namespace JSC {
</span><span class="cx">
</span><span class="cx"> class CopiedSpace;
</span><span class="lines">@@ -441,7 +445,7 @@
</span><span class="cx"> ListableHandler<WeakReferenceHarvester>::List m_weakReferenceHarvesters;
</span><span class="cx"> ListableHandler<UnconditionalFinalizer>::List m_unconditionalFinalizers;
</span><span class="cx">
</span><del>- ParallelHelperClient m_helperClient;
</del><ins>+ std::unique_ptr<ParallelHelperClient> m_helperClient;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (190323 => 190324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-09-29 20:22:18 UTC (rev 190323)
+++ trunk/Source/WTF/ChangeLog 2015-09-29 20:25:42 UTC (rev 190324)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2015-09-29 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><ins>+ ParallelHelperPool::runFunctionInParallel() shouldn't allocate, and ParallelHelperPool.h shouldn't be included everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=149635
+
+ Reviewed by Saam Barati.
+
+ * wtf/ParallelHelperPool.h:
+ (WTF::ParallelHelperClient::runFunctionInParallel): Stack-allocate the task instead of heap-allocating it.
+
+2015-09-29 Filip Pizlo <fpizlo@apple.com>
+
</ins><span class="cx"> GC copy phase spans too many files
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=149586
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfParallelHelperPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ParallelHelperPool.h (190323 => 190324)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ParallelHelperPool.h 2015-09-29 20:22:18 UTC (rev 190323)
+++ trunk/Source/WTF/wtf/ParallelHelperPool.h 2015-09-29 20:25:42 UTC (rev 190324)
</span><span class="lines">@@ -148,14 +148,19 @@
</span><span class="cx"> // client->finish();
</span><span class="cx"> WTF_EXPORT_PRIVATE void runTaskInParallel(RefPtr<SharedTask>);
</span><span class="cx">
</span><del>- // Equivalent to:
</del><ins>+ // Semantically equivalent to:
</ins><span class="cx"> // client->setFunction(functor);
</span><span class="cx"> // client->doSomeHelping();
</span><span class="cx"> // client->finish();
</span><ins>+ //
+ // Except, unlike the above sequence, this won't allocate the task in the heap. This allocates
+ // the task on the stack because it knows that the task is not reachable after this method is
+ // done.
</ins><span class="cx"> template<typename Functor>
</span><span class="cx"> void runFunctionInParallel(const Functor& functor)
</span><span class="cx"> {
</span><del>- runTaskInParallel(createSharedTask(functor));
</del><ins>+ SharedTaskFunctor<Functor> sharedTask(functor);
+ runTaskInParallel(&sharedTask);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ParallelHelperPool& pool() { return *m_pool; }
</span></span></pre>
</div>
</div>
</body>
</html>