<!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>[201683] 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/201683">201683</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-06-04 12:26:24 -0700 (Sat, 04 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of HANDLE registration code in WorkQueueWin
https://bugs.webkit.org/show_bug.cgi?id=158375
Reviewed by Darin Adler.
* wtf/WorkQueue.h:
* wtf/win/WorkItemWin.cpp:
(WTF::HandleWorkItem::HandleWorkItem): Deleted.
(WTF::HandleWorkItem::createByAdoptingHandle): Deleted.
(WTF::HandleWorkItem::~HandleWorkItem): Deleted.
* wtf/win/WorkItemWin.h:
(WTF::HandleWorkItem::setWaitHandle): Deleted.
(WTF::HandleWorkItem::waitHandle): Deleted.
* wtf/win/WorkQueueWin.cpp:
(WTF::WorkQueue::handleCallback): Deleted.
(WTF::WorkQueue::platformInvalidate): Deleted.
(WTF::WorkQueue::unregisterWaitAndDestroyItemSoon): Deleted.
(WTF::WorkQueue::unregisterWaitAndDestroyItemCallback): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfWorkQueueh">trunk/Source/WTF/wtf/WorkQueue.h</a></li>
<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 (201682 => 201683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-04 19:11:17 UTC (rev 201682)
+++ trunk/Source/WTF/ChangeLog 2016-06-04 19:26:24 UTC (rev 201683)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-06-03 Anders Carlsson <andersca@apple.com>
+
+ Get rid of HANDLE registration code in WorkQueueWin
+ https://bugs.webkit.org/show_bug.cgi?id=158375
+
+ Reviewed by Darin Adler.
+
+ * wtf/WorkQueue.h:
+ * wtf/win/WorkItemWin.cpp:
+ (WTF::HandleWorkItem::HandleWorkItem): Deleted.
+ (WTF::HandleWorkItem::createByAdoptingHandle): Deleted.
+ (WTF::HandleWorkItem::~HandleWorkItem): Deleted.
+ * wtf/win/WorkItemWin.h:
+ (WTF::HandleWorkItem::setWaitHandle): Deleted.
+ (WTF::HandleWorkItem::waitHandle): Deleted.
+ * wtf/win/WorkQueueWin.cpp:
+ (WTF::WorkQueue::handleCallback): Deleted.
+ (WTF::WorkQueue::platformInvalidate): Deleted.
+ (WTF::WorkQueue::unregisterWaitAndDestroyItemSoon): Deleted.
+ (WTF::WorkQueue::unregisterWaitAndDestroyItemCallback): Deleted.
+
</ins><span class="cx"> 2016-06-03 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201663.
</span></span></pre></div>
<a id="trunkSourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WorkQueue.h (201682 => 201683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2016-06-04 19:11:17 UTC (rev 201682)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2016-06-04 19:26:24 UTC (rev 201683)
</span><span class="lines">@@ -93,16 +93,12 @@
</span><span class="cx"> void platformInvalidate();
</span><span class="cx">
</span><span class="cx"> #if USE(WINDOWS_EVENT_LOOP)
</span><del>- static void CALLBACK handleCallback(void* context, BOOLEAN timerOrWaitFired);
</del><span class="cx"> static void CALLBACK timerCallback(void* context, BOOLEAN timerOrWaitFired);
</span><span class="cx"> static DWORD WINAPI workThreadCallback(void* context);
</span><span class="cx">
</span><span class="cx"> bool tryRegisterAsWorkThread();
</span><span class="cx"> void unregisterAsWorkThread();
</span><span class="cx"> void performWorkOnRegisteredWorkThread();
</span><del>-
- static void unregisterWaitAndDestroyItemSoon(PassRefPtr<HandleWorkItem>);
- static DWORD WINAPI unregisterWaitAndDestroyItemCallback(void* context);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(EFL_EVENT_LOOP)
</span><span class="lines">@@ -116,9 +112,6 @@
</span><span class="cx"> Mutex m_workItemQueueLock;
</span><span class="cx"> Vector<RefPtr<WorkItemWin>> m_workItemQueue;
</span><span class="cx">
</span><del>- Mutex m_handlesLock;
- HashMap<HANDLE, RefPtr<HandleWorkItem>> m_handles;
-
</del><span class="cx"> HANDLE m_timerQueue;
</span><span class="cx"> #elif USE(GLIB_EVENT_LOOP) || USE(GENERIC_EVENT_LOOP)
</span><span class="cx"> ThreadIdentifier m_workQueueThread;
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkItemWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/win/WorkItemWin.cpp (201682 => 201683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.cpp 2016-06-04 19:11:17 UTC (rev 201682)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.cpp 2016-06-04 19:26:24 UTC (rev 201683)
</span><span class="lines">@@ -47,22 +47,4 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-HandleWorkItem::HandleWorkItem(HANDLE handle, NoncopyableFunction<void ()>&& function, WorkQueue* queue)
- : WorkItemWin(WTFMove(function), queue)
- , m_handle(handle)
- , m_waitHandle(0)
-{
- ASSERT_ARG(handle, handle);
-}
-
-RefPtr<HandleWorkItem> HandleWorkItem::createByAdoptingHandle(HANDLE handle, NoncopyableFunction<void ()>&& function, WorkQueue* queue)
-{
- return adoptRef(new HandleWorkItem(handle, WTFMove(function), queue));
-}
-
-HandleWorkItem::~HandleWorkItem()
-{
- ::CloseHandle(m_handle);
-}
-
</del><span class="cx"> } // namespace WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkItemWinh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/win/WorkItemWin.h (201682 => 201683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.h 2016-06-04 19:11:17 UTC (rev 201682)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.h 2016-06-04 19:26:24 UTC (rev 201683)
</span><span class="lines">@@ -53,21 +53,6 @@
</span><span class="cx"> RefPtr<WorkQueue> m_queue;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-class HandleWorkItem : public WorkItemWin {
-public:
- static RefPtr<HandleWorkItem> createByAdoptingHandle(HANDLE, NoncopyableFunction<void ()>&&, WorkQueue*);
- virtual ~HandleWorkItem();
-
- void setWaitHandle(HANDLE waitHandle) { m_waitHandle = waitHandle; }
- HANDLE waitHandle() const { return m_waitHandle; }
-
-private:
- HandleWorkItem(HANDLE, NoncopyableFunction<void ()>&&, WorkQueue*);
-
- HANDLE m_handle;
- HANDLE m_waitHandle;
-};
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkQueueWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/win/WorkQueueWin.cpp (201682 => 201683)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-06-04 19:11:17 UTC (rev 201682)
+++ trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-06-04 19:26:24 UTC (rev 201683)
</span><span class="lines">@@ -32,31 +32,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><del>-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();
-}
-
</del><span class="cx"> DWORD WorkQueue::workThreadCallback(void* context)
</span><span class="cx"> {
</span><span class="cx"> ASSERT_ARG(context, context);
</span><span class="lines">@@ -119,11 +94,6 @@
</span><span class="cx">
</span><span class="cx"> void WorkQueue::platformInvalidate()
</span><span class="cx"> {
</span><del>-#if !ASSERT_DISABLED
- MutexLocker lock(m_handlesLock);
- ASSERT(m_handles.isEmpty());
-#endif
-
</del><span class="cx"> // FIXME: We need to ensure that any timer-queue timers that fire after this point don't try to
</span><span class="cx"> // access this WorkQueue <http://webkit.org/b/44690>.
</span><span class="cx"> ::DeleteTimerQueueEx(m_timerQueue, 0);
</span><span class="lines">@@ -221,29 +191,4 @@
</span><span class="cx"> context.release().leakRef();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> } // namespace WTF
</span></span></pre>
</div>
</div>
</body>
</html>