<!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>[201684] 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/201684">201684</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-06-04 13:53:25 -0700 (Sat, 04 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of WorkItemWin
https://bugs.webkit.org/show_bug.cgi?id=158381
Reviewed by Sam Weinig.
* wtf/PlatformWin.cmake:
* wtf/WorkQueue.h:
* wtf/win/WorkItemWin.cpp: Removed.
(WTF::WorkItemWin::WorkItemWin): Deleted.
(WTF::WorkItemWin::create): Deleted.
(WTF::WorkItemWin::~WorkItemWin): Deleted.
* wtf/win/WorkItemWin.h: Removed.
(WTF::WorkItemWin::function): Deleted.
(WTF::WorkItemWin::queue): Deleted.
* wtf/win/WorkQueueWin.cpp:
(WTF::WorkQueue::performWorkOnRegisteredWorkThread):
(WTF::WorkQueue::dispatch):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformWincmake">trunk/Source/WTF/wtf/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceWTFwtfWorkQueueh">trunk/Source/WTF/wtf/WorkQueue.h</a></li>
<li><a href="#trunkSourceWTFwtfwinWorkQueueWincpp">trunk/Source/WTF/wtf/win/WorkQueueWin.cpp</a></li>
</ul>
<h3>Removed 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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (201683 => 201684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-06-04 19:26:24 UTC (rev 201683)
+++ trunk/Source/WTF/ChangeLog 2016-06-04 20:53:25 UTC (rev 201684)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-06-04 Anders Carlsson <andersca@apple.com>
+
+ Get rid of WorkItemWin
+ https://bugs.webkit.org/show_bug.cgi?id=158381
+
+ Reviewed by Sam Weinig.
+
+ * wtf/PlatformWin.cmake:
+ * wtf/WorkQueue.h:
+ * wtf/win/WorkItemWin.cpp: Removed.
+ (WTF::WorkItemWin::WorkItemWin): Deleted.
+ (WTF::WorkItemWin::create): Deleted.
+ (WTF::WorkItemWin::~WorkItemWin): Deleted.
+ * wtf/win/WorkItemWin.h: Removed.
+ (WTF::WorkItemWin::function): Deleted.
+ (WTF::WorkItemWin::queue): Deleted.
+ * wtf/win/WorkQueueWin.cpp:
+ (WTF::WorkQueue::performWorkOnRegisteredWorkThread):
+ (WTF::WorkQueue::dispatch):
+
</ins><span class="cx"> 2016-06-03 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of HANDLE registration code in WorkQueueWin
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/PlatformWin.cmake (201683 => 201684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/PlatformWin.cmake 2016-06-04 19:26:24 UTC (rev 201683)
+++ trunk/Source/WTF/wtf/PlatformWin.cmake 2016-06-04 20:53:25 UTC (rev 201684)
</span><span class="lines">@@ -8,7 +8,6 @@
</span><span class="cx">
</span><span class="cx"> win/MainThreadWin.cpp
</span><span class="cx"> win/RunLoopWin.cpp
</span><del>- win/WorkItemWin.cpp
</del><span class="cx"> win/WorkQueueWin.cpp
</span><span class="cx"> )
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WorkQueue.h (201683 => 201684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2016-06-04 19:26:24 UTC (rev 201683)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2016-06-04 20:53:25 UTC (rev 201684)
</span><span class="lines">@@ -43,9 +43,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(WINDOWS_EVENT_LOOP)
</span><del>-#include <wtf/HashMap.h>
</del><span class="cx"> #include <wtf/Vector.h>
</span><del>-#include <wtf/win/WorkItemWin.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if USE(GLIB_EVENT_LOOP) || USE(GENERIC_EVENT_LOOP)
</span><span class="lines">@@ -109,8 +107,8 @@
</span><span class="cx"> #elif USE(WINDOWS_EVENT_LOOP)
</span><span class="cx"> volatile LONG m_isWorkThreadRegistered;
</span><span class="cx">
</span><del>- Mutex m_workItemQueueLock;
- Vector<RefPtr<WorkItemWin>> m_workItemQueue;
</del><ins>+ Mutex m_functionQueueLock;
+ Vector<NoncopyableFunction<void ()>> m_functionQueue;
</ins><span class="cx">
</span><span class="cx"> HANDLE m_timerQueue;
</span><span class="cx"> #elif USE(GLIB_EVENT_LOOP) || USE(GENERIC_EVENT_LOOP)
</span></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkItemWincpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/win/WorkItemWin.cpp (201683 => 201684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.cpp 2016-06-04 19:26:24 UTC (rev 201683)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.cpp 2016-06-04 20:53:25 UTC (rev 201684)
</span><span class="lines">@@ -1,50 +0,0 @@
</span><del>-/*
-* 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(NoncopyableFunction<void ()>&& function, WorkQueue* queue)
- : m_function(WTFMove(function))
- , m_queue(queue)
-{
-}
-
-RefPtr<WorkItemWin> WorkItemWin::create(NoncopyableFunction<void ()>&& function, WorkQueue* queue)
-{
- return adoptRef(new WorkItemWin(WTFMove(function), queue));
-}
-
-WorkItemWin::~WorkItemWin()
-{
-}
-
-} // namespace WTF
</del></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkItemWinh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WTF/wtf/win/WorkItemWin.h (201683 => 201684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkItemWin.h 2016-06-04 19:26:24 UTC (rev 201683)
+++ trunk/Source/WTF/wtf/win/WorkItemWin.h 2016-06-04 20:53:25 UTC (rev 201684)
</span><span class="lines">@@ -1,58 +0,0 @@
</span><del>-/*
-* 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/FunctionDispatcher.h>
-#include <wtf/RefPtr.h>
-#include <wtf/ThreadSafeRefCounted.h>
-
-namespace WTF {
-
-class WorkQueue;
-
-class WorkItemWin : public ThreadSafeRefCounted<WorkItemWin> {
-public:
- static RefPtr<WorkItemWin> create(NoncopyableFunction<void ()>&&, WorkQueue*);
- virtual ~WorkItemWin();
-
- NoncopyableFunction<void ()>& function() { return m_function; }
- WorkQueue* queue() const { return m_queue.get(); }
-
-protected:
- WorkItemWin(NoncopyableFunction<void ()>&&, WorkQueue*);
-
-private:
- NoncopyableFunction<void ()> m_function;
- RefPtr<WorkQueue> m_queue;
-};
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWTFwtfwinWorkQueueWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/win/WorkQueueWin.cpp (201683 => 201684)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-06-04 19:26:24 UTC (rev 201683)
+++ trunk/Source/WTF/wtf/win/WorkQueueWin.cpp 2016-06-04 20:53:25 UTC (rev 201684)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx"> #include <wtf/Threading.h>
</span><del>-#include <wtf/win/WorkItemWin.h>
</del><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="lines">@@ -49,19 +48,19 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_isWorkThreadRegistered);
</span><span class="cx">
</span><del>- m_workItemQueueLock.lock();
</del><ins>+ m_functionQueueLock.lock();
</ins><span class="cx">
</span><del>- while (!m_workItemQueue.isEmpty()) {
- Vector<RefPtr<WorkItemWin>> workItemQueue;
- m_workItemQueue.swap(workItemQueue);
</del><ins>+ while (!m_functionQueue.isEmpty()) {
+ Vector<NoncopyableFunction<void ()>> functionQueue;
+ m_functionQueue.swap(functionQueue);
</ins><span class="cx">
</span><span class="cx"> // Allow more work to be scheduled while we're not using the queue directly.
</span><del>- m_workItemQueueLock.unlock();
- for (auto& workItem : workItemQueue) {
- workItem->function()();
</del><ins>+ m_functionQueueLock.unlock();
+ for (auto& function : functionQueue) {
+ function();
</ins><span class="cx"> deref();
</span><span class="cx"> }
</span><del>- m_workItemQueueLock.lock();
</del><ins>+ m_functionQueueLock.lock();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // One invariant we maintain is that any work scheduled while a work thread is registered will
</span><span class="lines">@@ -69,7 +68,7 @@
</span><span class="cx"> // held so that no work can be scheduled while we're still registered.
</span><span class="cx"> unregisterAsWorkThread();
</span><span class="cx">
</span><del>- m_workItemQueueLock.unlock();
</del><ins>+ m_functionQueueLock.unlock();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkQueue::platformInitialize(const char* name, Type, QOS)
</span><span class="lines">@@ -101,9 +100,9 @@
</span><span class="cx">
</span><span class="cx"> void WorkQueue::dispatch(NoncopyableFunction<void ()>&& function)
</span><span class="cx"> {
</span><del>- MutexLocker locker(m_workItemQueueLock);
</del><ins>+ MutexLocker locker(m_functionQueueLock);
</ins><span class="cx"> ref();
</span><del>- m_workItemQueue.append(WorkItemWin::create(WTFMove(function), this));
</del><ins>+ m_functionQueue.append(WTFMove(function));
</ins><span class="cx">
</span><span class="cx"> // Spawn a work thread to perform the work we just added. As an optimization, we avoid
</span><span class="cx"> // spawning the thread if a work thread is already registered. This prevents multiple work
</span></span></pre>
</div>
</div>
</body>
</html>