<!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>[210271] trunk</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/210271">210271</a></dd>
<dt>Author</dt> <dd>utatane.tea@gmail.com</dd>
<dt>Date</dt> <dd>2017-01-03 23:52:05 -0800 (Tue, 03 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WorkQueueGeneric's platformInvalidate() can deadlock when called on the RunLoop's thread
https://bugs.webkit.org/show_bug.cgi?id=166645
Reviewed by Carlos Garcia Campos.
Source/WTF:
WorkQueue can be destroyed on its invoking thread itself.
The scenario is the following.
1. Create WorkQueue (in thread A).
2. Dispatch a task (in thread A, dispatching a task to thread B).
3. Deref in thread A.
4. The task is executed in thread B.
5. Deref in thread B.
6. The WorkQueue is destroyed, calling platformInvalidate in thread B.
In that case, if platformInvalidate waits thread B's termination, it causes deadlock.
We do not need to wait the thread termination.
* wtf/WorkQueue.h:
* wtf/generic/WorkQueueGeneric.cpp:
(WorkQueue::platformInitialize):
(WorkQueue::platformInvalidate):
Tools:
* TestWebKitAPI/Tests/WTF/WorkQueue.cpp:
(TestWebKitAPI::TEST):</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="#trunkSourceWTFwtfgenericWorkQueueGenericcpp">trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFWorkQueuecpp">trunk/Tools/TestWebKitAPI/Tests/WTF/WorkQueue.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (210270 => 210271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-01-04 06:41:01 UTC (rev 210270)
+++ trunk/Source/WTF/ChangeLog 2017-01-04 07:52:05 UTC (rev 210271)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-01-03 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ WorkQueueGeneric's platformInvalidate() can deadlock when called on the RunLoop's thread
+ https://bugs.webkit.org/show_bug.cgi?id=166645
+
+ Reviewed by Carlos Garcia Campos.
+
+ WorkQueue can be destroyed on its invoking thread itself.
+ The scenario is the following.
+
+ 1. Create WorkQueue (in thread A).
+ 2. Dispatch a task (in thread A, dispatching a task to thread B).
+ 3. Deref in thread A.
+ 4. The task is executed in thread B.
+ 5. Deref in thread B.
+ 6. The WorkQueue is destroyed, calling platformInvalidate in thread B.
+
+ In that case, if platformInvalidate waits thread B's termination, it causes deadlock.
+ We do not need to wait the thread termination.
+
+ * wtf/WorkQueue.h:
+ * wtf/generic/WorkQueueGeneric.cpp:
+ (WorkQueue::platformInitialize):
+ (WorkQueue::platformInvalidate):
+
</ins><span class="cx"> 2017-01-03 Sam Weinig <sam@webkit.org>
</span><span class="cx">
</span><span class="cx"> Make WTF::Expected support Ref template parameters
</span></span></pre></div>
<a id="trunkSourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WorkQueue.h (210270 => 210271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2017-01-04 06:41:01 UTC (rev 210270)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2017-01-04 07:52:05 UTC (rev 210271)
</span><span class="lines">@@ -116,8 +116,6 @@
</span><span class="cx"> Lock m_initializeRunLoopConditionMutex;
</span><span class="cx"> Condition m_initializeRunLoopCondition;
</span><span class="cx"> RunLoop* m_runLoop;
</span><del>- Lock m_terminateRunLoopConditionMutex;
- Condition m_terminateRunLoopCondition;
</del><span class="cx"> #endif
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWTFwtfgenericWorkQueueGenericcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp (210270 => 210271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp 2017-01-04 06:41:01 UTC (rev 210270)
+++ trunk/Source/WTF/wtf/generic/WorkQueueGeneric.cpp 2017-01-04 07:52:05 UTC (rev 210271)
</span><span class="lines">@@ -56,11 +56,6 @@
</span><span class="cx"> m_initializeRunLoopCondition.notifyOne();
</span><span class="cx"> }
</span><span class="cx"> m_runLoop->run();
</span><del>- {
- LockHolder locker(m_terminateRunLoopConditionMutex);
- m_runLoop = nullptr;
- m_terminateRunLoopCondition.notifyOne();
- }
</del><span class="cx"> });
</span><span class="cx"> m_initializeRunLoopCondition.wait(m_initializeRunLoopConditionMutex);
</span><span class="cx"> }
</span><span class="lines">@@ -67,14 +62,8 @@
</span><span class="cx">
</span><span class="cx"> void WorkQueue::platformInvalidate()
</span><span class="cx"> {
</span><del>- {
- LockHolder locker(m_terminateRunLoopConditionMutex);
- if (m_runLoop) {
- m_runLoop->stop();
- m_terminateRunLoopCondition.wait(m_terminateRunLoopConditionMutex);
- }
- }
-
</del><ins>+ if (m_runLoop)
+ m_runLoop->stop();
</ins><span class="cx"> if (m_workQueueThread) {
</span><span class="cx"> detachThread(m_workQueueThread);
</span><span class="cx"> m_workQueueThread = 0;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210270 => 210271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-04 06:41:01 UTC (rev 210270)
+++ trunk/Tools/ChangeLog 2017-01-04 07:52:05 UTC (rev 210271)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-01-03 Yusuke Suzuki <utatane.tea@gmail.com>
+
+ WorkQueueGeneric's platformInvalidate() can deadlock when called on the RunLoop's thread
+ https://bugs.webkit.org/show_bug.cgi?id=166645
+
+ Reviewed by Carlos Garcia Campos.
+
+ * TestWebKitAPI/Tests/WTF/WorkQueue.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2017-01-03 Andy Estes <aestes@apple.com>
</span><span class="cx">
</span><span class="cx"> Place all the Cocoa WebCore API tests in the same directory
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFWorkQueuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/WorkQueue.cpp (210270 => 210271)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/WorkQueue.cpp 2017-01-04 06:41:01 UTC (rev 210270)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/WorkQueue.cpp 2017-01-04 07:52:05 UTC (rev 210271)
</span><span class="lines">@@ -200,4 +200,37 @@
</span><span class="cx"> EXPECT_STREQ(dispatchAfterLabel, m_functionCallOrder[1].c_str());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TEST(WTF_WorkQueue, DestroyOnSelf)
+{
+ Lock lock;
+ Condition dispatchAfterTestStarted;
+ Condition dispatchAfterTestCompleted;
+ bool started = false;
+ bool completed = false;
+
+ {
+ LockHolder locker(lock);
+ {
+ auto queue = WorkQueue::create("com.apple.WebKit.Test.dispatchAfter");
+ queue->dispatchAfter(std::chrono::milliseconds(500), [&](void) {
+ LockHolder locker(lock);
+ dispatchAfterTestStarted.wait(lock, [&] {
+ return started;
+ });
+ completed = true;
+ dispatchAfterTestCompleted.notifyOne();
+ });
+ }
+ started = true;
+ dispatchAfterTestStarted.notifyOne();
+ }
+ {
+ LockHolder locker(lock);
+ dispatchAfterTestCompleted.wait(lock, [&] {
+ return completed;
+ });
+ WTF::sleep(0.1);
+ }
+}
+
</ins><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>