<!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>[181220] 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/181220">181220</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-03-07 20:57:54 -0800 (Sat, 07 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Revive WTF::WorkQueue on Windows
https://bugs.webkit.org/show_bug.cgi?id=142432
Reviewed by Darin Adler.
Revive the Windows implementation of WTF::WorkQueue.
* WTF.vcxproj/WTF.vcxproj:
* WTF.vcxproj/WTF.vcxproj.filters:
* wtf/WorkQueue.h:
* wtf/win/WorkItemWin.cpp: Added.
* wtf/win/WorkItemWin.h: Added.
* wtf/win/WorkQueueWin.cpp: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxprojfilters">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters</a></li>
<li><a href="#trunkSourceWTFwtfWorkQueueh">trunk/Source/WTF/wtf/WorkQueue.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfwinWorkItemWincpp">trunk/Source/WTF/wtf/win/WorkItemWin.cpp</a></li>
<li><a href="#trunkSourceWTFwtfwinWorkItemWinh">trunk/Source/WTF/wtf/win/WorkItemWin.h</a></li>
<li><a href="#trunkSourceWTFwtfwinWorkQueueWincpp">trunk/Source/WTF/wtf/win/WorkQueueWin.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (181219 => 181220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-03-08 03:37:26 UTC (rev 181219)
+++ trunk/Source/WTF/ChangeLog 2015-03-08 04:57:54 UTC (rev 181220)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-07 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Revive WTF::WorkQueue on Windows
+ https://bugs.webkit.org/show_bug.cgi?id=142432
+
+ Reviewed by Darin Adler.
+
+ Revive the Windows implementation of WTF::WorkQueue.
+
+ * WTF.vcxproj/WTF.vcxproj:
+ * WTF.vcxproj/WTF.vcxproj.filters:
+ * wtf/WorkQueue.h:
+ * wtf/win/WorkItemWin.cpp: Added.
+ * wtf/win/WorkItemWin.h: Added.
+ * wtf/win/WorkQueueWin.cpp: Added.
+
</ins><span class="cx"> 2015-03-06 Geoffrey Garen <ggaren@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix crashes seen on the the Windows buildbots after my last patch.
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (181219 => 181220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-03-08 03:37:26 UTC (rev 181219)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-03-08 04:57:54 UTC (rev 181220)
</span><span class="lines">@@ -149,7 +149,10 @@
</span><span class="cx"> <ClCompile Include="..\wtf\unicode\UTF8.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\win\MainThreadWin.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\win\RunLoopWin.cpp" />
</span><ins>+ <ClCompile Include="..\wtf\win\WorkItemWin.cpp" />
+ <ClCompile Include="..\wtf\win\WorkQueueWin.cpp" />
</ins><span class="cx"> <ClCompile Include="..\wtf\win\WTFDLL.cpp" />
</span><ins>+ <ClCompile Include="..\wtf\WorkQueue.cpp" />
</ins><span class="cx"> <ClCompile Include="..\wtf\WTFThreadData.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\SchedulePairCF.cpp" />
</span><span class="cx"> </ItemGroup>
</span><span class="lines">@@ -306,6 +309,8 @@
</span><span class="cx"> <ClInclude Include="..\wtf\Vector.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\VMTags.h" />
</span><span class="cx"> <ClInclude Include="..\wtf\win\GDIObject.h" />
</span><ins>+ <ClInclude Include="..\wtf\win\WorkItemWin.h" />
+ <ClInclude Include="..\wtf\WorkQueue.h" />
</ins><span class="cx"> <ClInclude Include="..\wtf\WTFThreadData.h" />
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -769,4 +774,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (181219 => 181220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-03-08 03:37:26 UTC (rev 181219)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-03-08 04:57:54 UTC (rev 181220)
</span><span class="lines">@@ -1,9 +1,6 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><span class="cx"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup>
</span><del>- <Filter Include="win">
- <UniqueIdentifier>{b7d787cb-2b2b-4898-8d03-b94115e596d1}</UniqueIdentifier>
- </Filter>
</del><span class="cx"> <Filter Include="dtoa">
</span><span class="cx"> <UniqueIdentifier>{eaa36939-1976-495f-b9ed-90074ee4f2be}</UniqueIdentifier>
</span><span class="cx"> </Filter>
</span><span class="lines">@@ -28,6 +25,9 @@
</span><span class="cx"> <Filter Include="wtf\gobject">
</span><span class="cx"> <UniqueIdentifier>{edd6ccc8-e6ee-41ec-a58d-9404a30c0c7e}</UniqueIdentifier>
</span><span class="cx"> </Filter>
</span><ins>+ <Filter Include="wtf\win">
+ <UniqueIdentifier>{b7d787cb-2b2b-4898-8d03-b94115e596d1}</UniqueIdentifier>
+ </Filter>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClCompile Include="..\wtf\dtoa\bignum-dtoa.cc">
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> <Filter>text</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\wtf\win\MainThreadWin.cpp">
</span><del>- <Filter>win</Filter>
</del><ins>+ <Filter>wtf\win</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\wtf\threads\win\BinarySemaphoreWin.cpp">
</span><span class="cx"> <Filter>threads\win</Filter>
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\wtf\win\RunLoopWin.cpp">
</span><del>- <Filter>win</Filter>
</del><ins>+ <Filter>wtf\win</Filter>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\wtf\gobject\GMainLoopSource.cpp">
</span><span class="cx"> <Filter>wtf\gobject</Filter>
</span><span class="lines">@@ -248,8 +248,17 @@
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\wtf\RefCounter.cpp" />
</span><span class="cx"> <ClCompile Include="..\wtf\win\WTFDLL.cpp">
</span><del>- <Filter>win</Filter>
</del><ins>+ <Filter>wtf\win</Filter>
</ins><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\wtf\WorkQueue.cpp">
+ <Filter>wtf</Filter>
+ </ClCompile>
+ <ClCompile Include="..\wtf\win\WorkQueueWin.cpp">
+ <Filter>wtf\win</Filter>
+ </ClCompile>
+ <ClCompile Include="..\wtf\win\WorkItemWin.cpp">
+ <Filter>wtf\win</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\wtf\dtoa\utils.h">
</span><span class="lines">@@ -671,7 +680,7 @@
</span><span class="cx"> <Filter>wtf</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\wtf\win\GDIObject.h">
</span><del>- <Filter>win</Filter>
</del><ins>+ <Filter>wtf\win</Filter>
</ins><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\wtf\gobject\GlibUtilities.h">
</span><span class="cx"> <Filter>wtf\gobject</Filter>
</span><span class="lines">@@ -707,9 +716,15 @@
</span><span class="cx"> <Filter>wtf\gobject</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="cx"> <ClInclude Include="..\wtf\RefCounter.h" />
</span><ins>+ <ClInclude Include="..\wtf\WorkQueue.h">
+ <Filter>wtf</Filter>
+ </ClInclude>
+ <ClInclude Include="..\wtf\win\WorkItemWin.h">
+ <Filter>wtf\win</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="WTFPostBuild.cmd" />
</span><span class="cx"> <None Include="WTFPreBuild.cmd" />
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WorkQueue.h (181219 => 181220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2015-03-08 03:37:26 UTC (rev 181219)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2015-03-08 04:57:54 UTC (rev 181220)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2010 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> * Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
</span><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="lines">@@ -44,6 +44,10 @@
</span><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> #include <DispatchQueueEfl.h>
</span><ins>+#elif OS(WINDOWS)
+#include <wtf/HashMap.h>
+#include <wtf/Vector.h>
+#include <wtf/win/WorkItemWin.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -84,6 +88,19 @@
</span><span class="cx"> void platformInitialize(const char* name, Type, QOS);
</span><span class="cx"> void platformInvalidate();
</span><span class="cx">
</span><ins>+#if OS(WINDOWS)
+ static void CALLBACK handleCallback(void* context, BOOLEAN timerOrWaitFired);
+ static void CALLBACK timerCallback(void* context, BOOLEAN timerOrWaitFired);
+ static DWORD WINAPI workThreadCallback(void* context);
+
+ bool tryRegisterAsWorkThread();
+ void unregisterAsWorkThread();
+ void performWorkOnRegisteredWorkThread();
+
+ static void unregisterWaitAndDestroyItemSoon(PassRefPtr<HandleWorkItem>);
+ static DWORD WINAPI unregisterWaitAndDestroyItemCallback(void* context);
+#endif
+
</ins><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> static void executeFunction(void*);
</span><span class="cx"> dispatch_queue_t m_dispatchQueue;
</span><span class="lines">@@ -95,6 +112,16 @@
</span><span class="cx"> GMainLoopSource m_socketEventSource;
</span><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> RefPtr<DispatchQueue> m_dispatchQueue;
</span><ins>+#elif OS(WINDOWS)
+ volatile LONG m_isWorkThreadRegistered;
+
+ Mutex m_workItemQueueLock;
+ Vector<RefPtr<WorkItemWin>> m_workItemQueue;
+
+ Mutex m_handlesLock;
+ HashMap<HANDLE, RefPtr<HandleWorkItem>> m_handles;
+
+ HANDLE m_timerQueue;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkItemWincpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/win/WorkItemWin.cpp (0 => 181220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.cpp (rev 0)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.cpp 2015-03-08 04:57:54 UTC (rev 181220)
</span><span class="lines">@@ -0,0 +1,68 @@
</span><ins>+/*
+* Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+* THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+#include "WorkItemWin.h"
+
+#include <Windows.h>
+#include <wtf/Threading.h>
+#include <wtf/WorkQueue.h>
+
+namespace WTF {
+
+WorkItemWin::WorkItemWin(std::function<void()> function, WorkQueue* queue)
+ : m_function(function)
+ , m_queue(queue)
+{
+}
+
+RefPtr<WorkItemWin> WorkItemWin::create(std::function<void()> function, WorkQueue* queue)
+{
+ return adoptRef(new WorkItemWin(function, queue));
+}
+
+WorkItemWin::~WorkItemWin()
+{
+}
+
+HandleWorkItem::HandleWorkItem(HANDLE handle, const std::function<void()>& function, WorkQueue* queue)
+ : WorkItemWin(function, queue)
+ , m_handle(handle)
+ , m_waitHandle(0)
+{
+ ASSERT_ARG(handle, handle);
+}
+
+RefPtr<HandleWorkItem> HandleWorkItem::createByAdoptingHandle(HANDLE handle, const std::function<void()>& function, WorkQueue* queue)
+{
+ return adoptRef(new HandleWorkItem(handle, function, queue));
+}
+
+HandleWorkItem::~HandleWorkItem()
+{
+ ::CloseHandle(m_handle);
+}
+
+} // namespace WTF
</ins></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkItemWinh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/win/WorkItemWin.h (0 => 181220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.h (rev 0)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.h 2015-03-08 04:57:54 UTC (rev 181220)
</span><span class="lines">@@ -0,0 +1,72 @@
</span><ins>+/*
+* Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
+* Portions Copyright (c) 2010 Motorola Mobility, Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+* THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#ifndef WorkItemWin_h
+#define WorkItemWin_h
+
+#include <Windows.h>
+#include <functional>
+#include <wtf/RefPtr.h>
+#include <wtf/ThreadSafeRefCounted.h>
+
+namespace WTF {
+
+class WorkQueue;
+
+class WorkItemWin : public ThreadSafeRefCounted<WorkItemWin> {
+public:
+ static RefPtr<WorkItemWin> create(std::function<void()>, WorkQueue*);
+ virtual ~WorkItemWin();
+
+ std::function<void()>& function() { return m_function; }
+ WorkQueue* queue() const { return m_queue.get(); }
+
+protected:
+ WorkItemWin(std::function<void()>, WorkQueue*);
+
+private:
+ std::function<void()> m_function;
+ RefPtr<WorkQueue> m_queue;
+};
+
+class HandleWorkItem : public WorkItemWin {
+public:
+ static RefPtr<HandleWorkItem> createByAdoptingHandle(HANDLE, const std::function<void()>&, WorkQueue*);
+ virtual ~HandleWorkItem();
+
+ void setWaitHandle(HANDLE waitHandle) { m_waitHandle = waitHandle; }
+ HANDLE waitHandle() const { return m_waitHandle; }
+
+private:
+ HandleWorkItem(HANDLE, const std::function<void()>&, WorkQueue*);
+
+ HANDLE m_handle;
+ HANDLE m_waitHandle;
+};
+
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkQueueWincpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/win/WorkQueueWin.cpp (0 => 181220)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkQueueWin.cpp (rev 0)
+++ trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2015-03-08 04:57:54 UTC (rev 181220)
</span><span class="lines">@@ -0,0 +1,234 @@
</span><ins>+/*
+* Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
+*
+* Redistribution and use in source and binary forms, with or without
+* modification, are permitted provided that the following conditions
+* are met:
+* 1. Redistributions of source code must retain the above copyright
+* notice, this list of conditions and the following disclaimer.
+* 2. Redistributions in binary form must reproduce the above copyright
+* notice, this list of conditions and the following disclaimer in the
+* documentation and/or other materials provided with the distribution.
+*
+* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+* THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+#include "config.h"
+#include "WorkQueue.h"
+
+#include <wtf/MathExtras.h>
+#include <wtf/Threading.h>
+#include <wtf/win/WorkItemWin.h>
+
+namespace WTF {
+
+void WorkQueue::handleCallback(void* context, BOOLEAN timerOrWaitFired)
+{
+ ASSERT_ARG(context, context);
+ ASSERT_ARG(timerOrWaitFired, !timerOrWaitFired);
+
+ WorkItemWin* item = static_cast<WorkItemWin*>(context);
+ RefPtr<WorkQueue> queue = item->queue();
+
+ {
+ MutexLocker lock(queue->m_workItemQueueLock);
+ queue->m_workItemQueue.append(item);
+
+ // If no other thread is performing work, we can do it on this thread.
+ if (!queue->tryRegisterAsWorkThread()) {
+ // Some other thread is performing work. Since we hold the queue lock, we can be sure
+ // that the work thread is not exiting due to an empty queue and will process the work
+ // item we just added to it. If we weren't holding the lock we'd have to signal
+ // m_performWorkEvent to make sure the work item got picked up.
+ return;
+ }
+ }
+
+ queue->performWorkOnRegisteredWorkThread();
+}
+
+DWORD WorkQueue::workThreadCallback(void* context)
+{
+ ASSERT_ARG(context, context);
+
+ WorkQueue* queue = static_cast<WorkQueue*>(context);
+
+ if (!queue->tryRegisterAsWorkThread())
+ return 0;
+
+ queue->performWorkOnRegisteredWorkThread();
+ return 0;
+}
+
+void WorkQueue::performWorkOnRegisteredWorkThread()
+{
+ ASSERT(m_isWorkThreadRegistered);
+
+ m_workItemQueueLock.lock();
+
+ while (!m_workItemQueue.isEmpty()) {
+ Vector<RefPtr<WorkItemWin>> workItemQueue;
+ m_workItemQueue.swap(workItemQueue);
+
+ // Allow more work to be scheduled while we're not using the queue directly.
+ m_workItemQueueLock.unlock();
+ for (auto& workItem : workItemQueue)
+ workItem->function()();
+ m_workItemQueueLock.lock();
+ }
+
+ // One invariant we maintain is that any work scheduled while a work thread is registered will
+ // be handled by that work thread. Unregister as the work thread while the queue lock is still
+ // held so that no work can be scheduled while we're still registered.
+ unregisterAsWorkThread();
+
+ m_workItemQueueLock.unlock();
+}
+
+void WorkQueue::platformInitialize(const char* name, Type, QOS)
+{
+ m_isWorkThreadRegistered = 0;
+ m_timerQueue = ::CreateTimerQueue();
+ ASSERT_WITH_MESSAGE(m_timerQueue, "::CreateTimerQueue failed with error %lu", ::GetLastError());
+}
+
+bool WorkQueue::tryRegisterAsWorkThread()
+{
+ LONG result = ::InterlockedCompareExchange(&m_isWorkThreadRegistered, 1, 0);
+ ASSERT(!result || result == 1);
+ return !result;
+}
+
+void WorkQueue::unregisterAsWorkThread()
+{
+ LONG result = ::InterlockedCompareExchange(&m_isWorkThreadRegistered, 0, 1);
+ ASSERT_UNUSED(result, result == 1);
+}
+
+void WorkQueue::platformInvalidate()
+{
+#if !ASSERT_DISABLED
+ MutexLocker lock(m_handlesLock);
+ ASSERT(m_handles.isEmpty());
+#endif
+
+ // FIXME: We need to ensure that any timer-queue timers that fire after this point don't try to
+ // access this WorkQueue <http://webkit.org/b/44690>.
+ ::DeleteTimerQueueEx(m_timerQueue, 0);
+}
+
+void WorkQueue::dispatch(std::function<void()> function)
+{
+ MutexLocker locker(m_workItemQueueLock);
+ ref();
+ m_workItemQueue.append(WorkItemWin::create(function, this));
+
+ // Spawn a work thread to perform the work we just added. As an optimization, we avoid
+ // spawning the thread if a work thread is already registered. This prevents multiple work
+ // threads from being spawned in most cases. (Note that when a work thread has been spawned but
+ // hasn't registered itself yet, m_isWorkThreadRegistered will be false and we'll end up
+ // spawning a second work thread here. But work thread registration process will ensure that
+ // only one thread actually ends up performing work.)
+ if (!m_isWorkThreadRegistered)
+ ::QueueUserWorkItem(workThreadCallback, this, WT_EXECUTEDEFAULT);
+}
+
+struct TimerContext : public ThreadSafeRefCounted<TimerContext> {
+ static RefPtr<TimerContext> create() { return adoptRef(new TimerContext); }
+
+ WorkQueue* queue;
+ std::function<void()> function;
+ Mutex timerMutex;
+ HANDLE timer;
+
+private:
+ TimerContext()
+ : queue(nullptr)
+ , timer(0)
+ {
+ }
+};
+
+void WorkQueue::timerCallback(void* context, BOOLEAN timerOrWaitFired)
+{
+ ASSERT_ARG(context, context);
+ ASSERT_UNUSED(timerOrWaitFired, timerOrWaitFired);
+
+ // Balanced by leakRef in scheduleWorkAfterDelay.
+ RefPtr<TimerContext> timerContext = adoptRef(static_cast<TimerContext*>(context));
+
+ timerContext->queue->dispatch(timerContext->function);
+
+ MutexLocker lock(timerContext->timerMutex);
+ ASSERT(timerContext->timer);
+ ASSERT(timerContext->queue->m_timerQueue);
+ if (!::DeleteTimerQueueTimer(timerContext->queue->m_timerQueue, timerContext->timer, 0)) {
+ // Getting ERROR_IO_PENDING here means that the timer will be destroyed once the callback is done executing.
+ ASSERT_WITH_MESSAGE(::GetLastError() == ERROR_IO_PENDING, "::DeleteTimerQueueTimer failed with error %lu", ::GetLastError());
+ }
+}
+
+void WorkQueue::dispatchAfter(std::chrono::nanoseconds duration, std::function<void()> function)
+{
+ ASSERT(m_timerQueue);
+ ref();
+
+ RefPtr<TimerContext> context = TimerContext::create();
+ context->queue = this;
+ context->function = function;
+
+ {
+ // The timer callback could fire before ::CreateTimerQueueTimer even returns, so we protect
+ // context->timer with a mutex to ensure the timer callback doesn't access it before the
+ // timer handle has been stored in it.
+ MutexLocker lock(context->timerMutex);
+
+ // Since our timer callback is quick, we can execute in the timer thread itself and avoid
+ // an extra thread switch over to a worker thread.
+ int64_t milliseconds = std::chrono::duration_cast<std::chrono::milliseconds>(duration).count();
+ if (!::CreateTimerQueueTimer(&context->timer, m_timerQueue, timerCallback, context.get(), clampTo<DWORD>(milliseconds), 0, WT_EXECUTEINTIMERTHREAD)) {
+ ASSERT_WITH_MESSAGE(false, "::CreateTimerQueueTimer failed with error %lu", ::GetLastError());
+ return;
+ }
+ }
+
+ // The timer callback will handle destroying context.
+ context.release().leakRef();
+}
+
+void WorkQueue::unregisterWaitAndDestroyItemSoon(PassRefPtr<HandleWorkItem> item)
+{
+ // We're going to make a blocking call to ::UnregisterWaitEx before closing the handle. (The
+ // blocking version of ::UnregisterWaitEx is much simpler than the non-blocking version.) If we
+ // do this on the current thread, we'll deadlock if we're currently in a callback function for
+ // the wait we're unregistering. So instead we do it asynchronously on some other worker thread.
+
+ ::QueueUserWorkItem(unregisterWaitAndDestroyItemCallback, item.leakRef(), WT_EXECUTEDEFAULT);
+}
+
+DWORD WINAPI WorkQueue::unregisterWaitAndDestroyItemCallback(void* context)
+{
+ ASSERT_ARG(context, context);
+ RefPtr<HandleWorkItem> item = adoptRef(static_cast<HandleWorkItem*>(context));
+
+ // Now that we know we're not in a callback function for the wait we're unregistering, we can
+ // make a blocking call to ::UnregisterWaitEx.
+ if (!::UnregisterWaitEx(item->waitHandle(), INVALID_HANDLE_VALUE)) {
+ DWORD error = ::GetLastError();
+ ASSERT_NOT_REACHED();
+ }
+
+ return 0;
+}
+
+} // namespace WTF
</ins></span></pre>
</div>
</div>
</body>
</html>