<!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>[189709] releases/WebKitGTK/webkit-2.10/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/189709">189709</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-14 04:01:30 -0700 (Mon, 14 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188981">r188981</a> - Add and implement WorkQueue::concurrentApply
https://bugs.webkit.org/show_bug.cgi?id=148488
Reviewed by Geoffrey Garen.
WorkQueue::concurrentApply is modeled after dispatch_apply, and on Cocoa it uses dispatch_apply directly.
For other ports there's a generic concurrentApply implemented using our threading primitives.
* wtf/NeverDestroyed.h:
(WTF::LazyNeverDestroyed::operator->):
* wtf/WorkQueue.cpp:
(WTF::WorkQueue::concurrentApply):
* wtf/WorkQueue.h:
* wtf/cocoa/WorkQueueCocoa.cpp:
(WTF::WorkQueue::concurrentApply):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFChangeLog">releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFwtfNeverDestroyedh">releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/NeverDestroyed.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFwtfWorkQueuecpp">releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFwtfWorkQueueh">releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFwtfcocoaWorkQueueCocoacpp">releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog (189708 => 189709)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-09-14 10:40:55 UTC (rev 189708)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog 2015-09-14 11:01:30 UTC (rev 189709)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-08-26 Anders Carlsson <andersca@apple.com>
+
+ Fix build.
+
+ * wtf/WorkQueue.cpp:
+
+2015-08-26 Anders Carlsson <andersca@apple.com>
+
+ Add and implement WorkQueue::concurrentApply
+ https://bugs.webkit.org/show_bug.cgi?id=148488
+
+ Reviewed by Geoffrey Garen.
+
+ WorkQueue::concurrentApply is modeled after dispatch_apply, and on Cocoa it uses dispatch_apply directly.
+ For other ports there's a generic concurrentApply implemented using our threading primitives.
+
+ * wtf/NeverDestroyed.h:
+ (WTF::LazyNeverDestroyed::operator->):
+ * wtf/WorkQueue.cpp:
+ (WTF::WorkQueue::concurrentApply):
+ * wtf/WorkQueue.h:
+ * wtf/cocoa/WorkQueueCocoa.cpp:
+ (WTF::WorkQueue::concurrentApply):
+
</ins><span class="cx"> 2015-08-18 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GLib] GMainLoopSource should receive the std::function<> objects through rvalue references
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWTFwtfNeverDestroyedh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/NeverDestroyed.h (189708 => 189709)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/NeverDestroyed.h 2015-09-14 10:40:55 UTC (rev 189708)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/NeverDestroyed.h 2015-09-14 11:01:30 UTC (rev 189709)
</span><span class="lines">@@ -94,6 +94,8 @@
</span><span class="cx"> operator T&() { return *asPtr(); }
</span><span class="cx"> T& get() { return *asPtr(); }
</span><span class="cx">
</span><ins>+ T* operator->() { return asPtr(); }
+
</ins><span class="cx"> private:
</span><span class="cx"> typedef typename std::remove_const<T>::type* PointerType;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWTFwtfWorkQueuecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.cpp (189708 => 189709)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.cpp 2015-09-14 10:40:55 UTC (rev 189708)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.cpp 2015-09-14 11:01:30 UTC (rev 189709)
</span><span class="lines">@@ -26,7 +26,14 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WorkQueue.h"
</span><span class="cx">
</span><del>-#include "Ref.h"
</del><ins>+#include <mutex>
+#include <wtf/MessageQueue.h>
+#include <wtf/NeverDestroyed.h>
+#include <wtf/NumberOfCores.h>
+#include <wtf/Ref.h>
+#include <wtf/Threading.h>
+#include <wtf/text/WTFString.h>
+#include <wtf/threads/BinarySemaphore.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -45,4 +52,105 @@
</span><span class="cx"> platformInvalidate();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(COCOA)
+void WorkQueue::concurrentApply(size_t iterations, const std::function<void (size_t index)>& function)
+{
+ if (!iterations)
+ return;
+
+ if (iterations == 1) {
+ function(0);
+ return;
+ }
+
+ class ThreadPool {
+ public:
+ ThreadPool()
+ {
+ // We don't need a thread for the current core.
+ unsigned threadCount = numberOfProcessorCores() - 1;
+
+ m_workers.reserveInitialCapacity(threadCount);
+ for (unsigned i = 0; i < threadCount; ++i) {
+ m_workers.append(createThread(String::format("ThreadPool Worker %u", i).utf8().data(), [this] {
+ threadBody();
+ }));
+ }
+ }
+
+ size_t workerCount() const { return m_workers.size(); }
+
+ void dispatch(const std::function<void ()>* function)
+ {
+ LockHolder holder(m_lock);
+
+ m_queue.append(function);
+ m_condition.notifyOne();
+ }
+
+ private:
+ NO_RETURN void threadBody()
+ {
+ while (true) {
+ const std::function<void ()>* function;
+
+ {
+ LockHolder holder(m_lock);
+
+ m_condition.wait(m_lock, [this] {
+ return !m_queue.isEmpty();
+ });
+
+ function = m_queue.takeFirst();
+ }
+
+ (*function)();
+ }
+ }
+
+ Lock m_lock;
+ Condition m_condition;
+ Deque<const std::function<void ()>*> m_queue;
+
+ Vector<ThreadIdentifier> m_workers;
+ };
+
+ static LazyNeverDestroyed<ThreadPool> threadPool;
+ static std::once_flag onceFlag;
+ std::call_once(onceFlag, [] {
+ threadPool.construct();
+ });
+
+ // Cap the worker count to the number of iterations (excluding this thread)
+ const size_t workerCount = std::min(iterations - 1, threadPool->workerCount());
+
+ std::atomic<size_t> currentIndex(0);
+ std::atomic<size_t> activeThreads(workerCount + 1);
+
+ Condition condition;
+ Lock lock;
+
+ std::function<void ()> applier = [&] {
+ size_t index;
+
+ // Call the function for as long as there are iterations left.
+ while ((index = currentIndex++) < iterations)
+ function(index);
+
+ // If there are no active threads left, signal the caller.
+ if (!--activeThreads) {
+ LockHolder holder(lock);
+ condition.notifyOne();
+ }
+ };
+
+ for (size_t i = 0; i < workerCount; ++i)
+ threadPool->dispatch(&applier);
+ applier();
+
+ LockHolder holder(lock);
+ condition.wait(lock, [&] { return !activeThreads; });
</ins><span class="cx"> }
</span><ins>+#endif
+
+}
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.h (189708 => 189709)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.h 2015-09-14 10:40:55 UTC (rev 189708)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/WorkQueue.h 2015-09-14 11:01:30 UTC (rev 189709)
</span><span class="lines">@@ -71,6 +71,8 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE virtual void dispatch(std::function<void ()>) override;
</span><span class="cx"> WTF_EXPORT_PRIVATE void dispatchAfter(std::chrono::nanoseconds, std::function<void ()>);
</span><span class="cx">
</span><ins>+ WTF_EXPORT_PRIVATE static void concurrentApply(size_t iterations, const std::function<void (size_t index)>&);
+
</ins><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> dispatch_queue_t dispatchQueue() const { return m_dispatchQueue; }
</span><span class="cx"> #elif PLATFORM(GTK)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWTFwtfcocoaWorkQueueCocoacpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp (189708 => 189709)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2015-09-14 10:40:55 UTC (rev 189708)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/cocoa/WorkQueueCocoa.cpp 2015-09-14 11:01:30 UTC (rev 189709)
</span><span class="lines">@@ -102,4 +102,11 @@
</span><span class="cx"> dispatch_release(m_dispatchQueue);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WorkQueue::concurrentApply(size_t iterations, const std::function<void (size_t index)>& function)
+{
+ dispatch_apply(iterations, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^(size_t index) {
+ function(index);
+ });
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre>
</div>
</div>
</body>
</html>