<!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>[190875] trunk/Source/WTF</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/190875">190875</a></dd>
<dt>Author</dt> <dd>fpizlo@apple.com</dd>
<dt>Date</dt> <dd>2015-10-12 11:45:00 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, fix style in the hopes that it fixes Windows.
* wtf/ParallelHelperPool.cpp:
(WTF::ParallelHelperClient::~ParallelHelperClient):
(WTF::ParallelHelperClient::setTask):
(WTF::ParallelHelperClient::doSomeHelping):
(WTF::ParallelHelperClient::runTaskInParallel):
(WTF::ParallelHelperClient::finish):
(WTF::ParallelHelperClient::claimTask):
(WTF::ParallelHelperClient::runTask):
(WTF::ParallelHelperPool::doSomeHelping):
(WTF::ParallelHelperPool::helperThreadBody):
* wtf/ParallelHelperPool.h:
(WTF::ParallelHelperClient::setFunction):
(WTF::ParallelHelperClient::runFunctionInParallel):
(WTF::ParallelHelperClient::pool):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfParallelHelperPoolcpp">trunk/Source/WTF/wtf/ParallelHelperPool.cpp</a></li>
<li><a href="#trunkSourceWTFwtfParallelHelperPoolh">trunk/Source/WTF/wtf/ParallelHelperPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (190874 => 190875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-10-12 18:43:00 UTC (rev 190874)
+++ trunk/Source/WTF/ChangeLog 2015-10-12 18:45:00 UTC (rev 190875)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-10-12 Filip Pizlo <fpizlo@apple.com>
+
+ Unreviewed, fix style in the hopes that it fixes Windows.
+
+ * wtf/ParallelHelperPool.cpp:
+ (WTF::ParallelHelperClient::~ParallelHelperClient):
+ (WTF::ParallelHelperClient::setTask):
+ (WTF::ParallelHelperClient::doSomeHelping):
+ (WTF::ParallelHelperClient::runTaskInParallel):
+ (WTF::ParallelHelperClient::finish):
+ (WTF::ParallelHelperClient::claimTask):
+ (WTF::ParallelHelperClient::runTask):
+ (WTF::ParallelHelperPool::doSomeHelping):
+ (WTF::ParallelHelperPool::helperThreadBody):
+ * wtf/ParallelHelperPool.h:
+ (WTF::ParallelHelperClient::setFunction):
+ (WTF::ParallelHelperClient::runFunctionInParallel):
+ (WTF::ParallelHelperClient::pool):
+
</ins><span class="cx"> 2015-10-10 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> FTL should generate code to call slow paths lazily
</span></span></pre></div>
<a id="trunkSourceWTFwtfParallelHelperPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ParallelHelperPool.cpp (190874 => 190875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ParallelHelperPool.cpp 2015-10-12 18:43:00 UTC (rev 190874)
+++ trunk/Source/WTF/wtf/ParallelHelperPool.cpp 2015-10-12 18:45:00 UTC (rev 190875)
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ParallelHelperClient::setTask(RefPtr<SharedTask<void()>> task)
</del><ins>+void ParallelHelperClient::setTask(RefPtr<SharedTask<void ()>> task)
</ins><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_pool->m_lock);
</span><span class="cx"> RELEASE_ASSERT(!m_task);
</span><span class="lines">@@ -69,7 +69,7 @@
</span><span class="cx">
</span><span class="cx"> void ParallelHelperClient::doSomeHelping()
</span><span class="cx"> {
</span><del>- RefPtr<SharedTask<void()>> task;
</del><ins>+ RefPtr<SharedTask<void ()>> task;
</ins><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_pool->m_lock);
</span><span class="cx"> task = claimTask(locker);
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> runTask(task);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ParallelHelperClient::runTaskInParallel(RefPtr<SharedTask<void()>> task)
</del><ins>+void ParallelHelperClient::runTaskInParallel(RefPtr<SharedTask<void ()>> task)
</ins><span class="cx"> {
</span><span class="cx"> setTask(task);
</span><span class="cx"> doSomeHelping();
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> m_pool->m_workCompleteCondition.wait(m_pool->m_lock);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<SharedTask<void()>> ParallelHelperClient::claimTask(const LockHolder&)
</del><ins>+RefPtr<SharedTask<void ()>> ParallelHelperClient::claimTask(const LockHolder&)
</ins><span class="cx"> {
</span><span class="cx"> if (!m_task)
</span><span class="cx"> return nullptr;
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> return m_task;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ParallelHelperClient::runTask(RefPtr<SharedTask<void()>> task)
</del><ins>+void ParallelHelperClient::runTask(RefPtr<SharedTask<void ()>> task)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(m_numActive);
</span><span class="cx"> RELEASE_ASSERT(task);
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> void ParallelHelperPool::doSomeHelping()
</span><span class="cx"> {
</span><span class="cx"> ParallelHelperClient* client;
</span><del>- RefPtr<SharedTask<void()>> task;
</del><ins>+ RefPtr<SharedTask<void ()>> task;
</ins><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_lock);
</span><span class="cx"> client = getClientWithTask(locker);
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> {
</span><span class="cx"> for (;;) {
</span><span class="cx"> ParallelHelperClient* client;
</span><del>- RefPtr<SharedTask<void()>> task;
</del><ins>+ RefPtr<SharedTask<void ()>> task;
</ins><span class="cx">
</span><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_lock);
</span></span></pre></div>
<a id="trunkSourceWTFwtfParallelHelperPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/ParallelHelperPool.h (190874 => 190875)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/ParallelHelperPool.h 2015-10-12 18:43:00 UTC (rev 190874)
+++ trunk/Source/WTF/wtf/ParallelHelperPool.h 2015-10-12 18:45:00 UTC (rev 190875)
</span><span class="lines">@@ -130,12 +130,12 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE ParallelHelperClient(RefPtr<ParallelHelperPool>);
</span><span class="cx"> WTF_EXPORT_PRIVATE ~ParallelHelperClient();
</span><span class="cx">
</span><del>- WTF_EXPORT_PRIVATE void setTask(RefPtr<SharedTask<void()>>);
</del><ins>+ WTF_EXPORT_PRIVATE void setTask(RefPtr<SharedTask<void ()>>);
</ins><span class="cx">
</span><span class="cx"> template<typename Functor>
</span><span class="cx"> void setFunction(const Functor& functor)
</span><span class="cx"> {
</span><del>- setTask(createSharedTask<void()>(functor));
</del><ins>+ setTask(createSharedTask<void ()>(functor));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WTF_EXPORT_PRIVATE void finish();
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> // client->setTask(task);
</span><span class="cx"> // client->doSomeHelping();
</span><span class="cx"> // client->finish();
</span><del>- WTF_EXPORT_PRIVATE void runTaskInParallel(RefPtr<SharedTask<void()>>);
</del><ins>+ WTF_EXPORT_PRIVATE void runTaskInParallel(RefPtr<SharedTask<void ()>>);
</ins><span class="cx">
</span><span class="cx"> // Equivalent to:
</span><span class="cx"> // client->setFunction(functor);
</span><span class="lines">@@ -155,7 +155,7 @@
</span><span class="cx"> template<typename Functor>
</span><span class="cx"> void runFunctionInParallel(const Functor& functor)
</span><span class="cx"> {
</span><del>- runTaskInParallel(createSharedTask<void()>(functor));
</del><ins>+ runTaskInParallel(createSharedTask<void ()>(functor));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ParallelHelperPool& pool() { return *m_pool; }
</span><span class="lines">@@ -165,11 +165,11 @@
</span><span class="cx"> friend class ParallelHelperPool;
</span><span class="cx">
</span><span class="cx"> void finish(const LockHolder&);
</span><del>- RefPtr<SharedTask<void()>> claimTask(const LockHolder&);
- void runTask(RefPtr<SharedTask<void()>>);
</del><ins>+ RefPtr<SharedTask<void ()>> claimTask(const LockHolder&);
+ void runTask(RefPtr<SharedTask<void ()>>);
</ins><span class="cx">
</span><span class="cx"> RefPtr<ParallelHelperPool> m_pool;
</span><del>- RefPtr<SharedTask<void()>> m_task;
</del><ins>+ RefPtr<SharedTask<void ()>> m_task;
</ins><span class="cx"> unsigned m_numActive { 0 };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>