Changeset 181220 in webkit

Timestamp:

Mar 7, 2015 8:57:54 PM (9 years ago)

Author:

Brent Fulgham

Message:

[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.

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• WTF.vcxproj/WTF.vcxproj (modified) (2 diffs)
• WTF.vcxproj/WTF.vcxproj.filters (modified) (7 diffs)
• wtf/WorkQueue.h (modified) (4 diffs)
• wtf/win/WorkItemWin.cpp (added)
• wtf/win/WorkItemWin.h (added)
• wtf/win/WorkQueueWin.cpp (added)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+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.
+
 2015-03-06  Geoffrey Garen  <ggaren@apple.com>
 

trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj

@@ -150 +150 @@
     <ClCompile Include="..\wtf\win\MainThreadWin.cpp" />
     <ClCompile Include="..\wtf\win\RunLoopWin.cpp" />
+    <ClCompile Include="..\wtf\win\WorkItemWin.cpp" />
+    <ClCompile Include="..\wtf\win\WorkQueueWin.cpp" />
     <ClCompile Include="..\wtf\win\WTFDLL.cpp" />
+    <ClCompile Include="..\wtf\WorkQueue.cpp" />
     <ClCompile Include="..\wtf\WTFThreadData.cpp" />
     <ClCompile Include="..\wtf\SchedulePairCF.cpp" />
@@ -307 +310 @@
     <ClInclude Include="..\wtf\VMTags.h" />
     <ClInclude Include="..\wtf\win\GDIObject.h" />
+    <ClInclude Include="..\wtf\win\WorkItemWin.h" />
+    <ClInclude Include="..\wtf\WorkQueue.h" />
     <ClInclude Include="..\wtf\WTFThreadData.h" />
   </ItemGroup>

trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters

@@ -2 +2 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="win">
-      <UniqueIdentifier>{b7d787cb-2b2b-4898-8d03-b94115e596d1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="dtoa">
       <UniqueIdentifier>{eaa36939-1976-495f-b9ed-90074ee4f2be}</UniqueIdentifier>
@@ -28 +25 @@
     <Filter Include="wtf\gobject">
       <UniqueIdentifier>{edd6ccc8-e6ee-41ec-a58d-9404a30c0c7e}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="wtf\win">
+      <UniqueIdentifier>{b7d787cb-2b2b-4898-8d03-b94115e596d1}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
@@ -95 +95 @@
     </ClCompile>
     <ClCompile Include="..\wtf\win\MainThreadWin.cpp">
-      <Filter>win</Filter>
+      <Filter>wtf\win</Filter>
     </ClCompile>
     <ClCompile Include="..\wtf\threads\win\BinarySemaphoreWin.cpp">
@@ -236 +236 @@
     </ClCompile>
     <ClCompile Include="..\wtf\win\RunLoopWin.cpp">
-      <Filter>win</Filter>
+      <Filter>wtf\win</Filter>
     </ClCompile>
     <ClCompile Include="..\wtf\gobject\GMainLoopSource.cpp">
@@ -249 +249 @@
     <ClCompile Include="..\wtf\RefCounter.cpp" />
     <ClCompile Include="..\wtf\win\WTFDLL.cpp">
-      <Filter>win</Filter>
+      <Filter>wtf\win</Filter>
+    </ClCompile>
+    <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>
   </ItemGroup>
@@ -672 +681 @@
     </ClInclude>
     <ClInclude Include="..\wtf\win\GDIObject.h">
-      <Filter>win</Filter>
+      <Filter>wtf\win</Filter>
     </ClInclude>
     <ClInclude Include="..\wtf\gobject\GlibUtilities.h">
@@ -708 +717 @@
     </ClInclude>
     <ClInclude Include="..\wtf\RefCounter.h" />
+    <ClInclude Include="..\wtf\WorkQueue.h">
+      <Filter>wtf</Filter>
+    </ClInclude>
+    <ClInclude Include="..\wtf\win\WorkItemWin.h">
+      <Filter>wtf\win</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>

trunk/Source/WTF/wtf/WorkQueue.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2015 Apple Inc. All rights reserved.
  * Portions Copyright (c) 2010 Motorola Mobility, Inc.  All rights reserved.
  *
@@ -45 +45 @@
 #elif PLATFORM(EFL)
 #include <DispatchQueueEfl.h>
+#elif OS(WINDOWS)
+#include <wtf/HashMap.h>
+#include <wtf/Vector.h>
+#include <wtf/win/WorkItemWin.h>
 #endif
 
@@ -85 +89 @@
     void platformInvalidate();
 
+#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
+
 #if OS(DARWIN)
     static void executeFunction(void*);
@@ -96 +113 @@
 #elif PLATFORM(EFL)
     RefPtr<DispatchQueue> m_dispatchQueue;
+#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;
 #endif
 };