<!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>[169051] trunk/Source/WebKit2</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/169051">169051</a></dd>
<dt>Author</dt> <dd>aestes@apple.com</dd>
<dt>Date</dt> <dd>2014-05-19 11:00:10 -0700 (Mon, 19 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebKit2] Wake up threads blocked in waitForAndDispatchImmediately() if we lose our connection
https://bugs.webkit.org/show_bug.cgi?id=133010
Reviewed by Geoffrey Garen.
If a thread is blocked on m_waitForMessageCondition and we lose our connection, treat that like we do a timeout.
* Platform/IPC/Connection.cpp:
(IPC::Connection::Connection):
(IPC::Connection::waitForMessage):
(IPC::Connection::connectionDidClose):
* Platform/IPC/Connection.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169050 => 169051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-19 17:50:49 UTC (rev 169050)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-19 18:00:10 UTC (rev 169051)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-05-16 Andy Estes <aestes@apple.com>
+
+ [WebKit2] Wake up threads blocked in waitForAndDispatchImmediately() if we lose our connection
+ https://bugs.webkit.org/show_bug.cgi?id=133010
+
+ Reviewed by Geoffrey Garen.
+
+ If a thread is blocked on m_waitForMessageCondition and we lose our connection, treat that like we do a timeout.
+
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::Connection):
+ (IPC::Connection::waitForMessage):
+ (IPC::Connection::connectionDidClose):
+ * Platform/IPC/Connection.h:
+
</ins><span class="cx"> 2014-05-19 Mark Rowe <mrowe@apple.com>
</span><span class="cx">
</span><span class="cx"> Build fix after r169023.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (169050 => 169051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-05-19 17:50:49 UTC (rev 169050)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-05-19 18:00:10 UTC (rev 169051)
</span><span class="lines">@@ -225,6 +225,7 @@
</span><span class="cx"> , m_inDispatchMessageCount(0)
</span><span class="cx"> , m_inDispatchMessageMarkedDispatchWhenWaitingForSyncReplyCount(0)
</span><span class="cx"> , m_didReceiveInvalidMessage(false)
</span><ins>+ , m_messageWaitingInterruptedByClosedConnection(false)
</ins><span class="cx"> , m_syncMessageState(SyncMessageState::getOrCreate(clientRunLoop))
</span><span class="cx"> , m_shouldWaitForSyncReplies(true)
</span><span class="cx"> {
</span><span class="lines">@@ -413,10 +414,16 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Now we wait.
</span><del>- if (m_waitForMessageCondition.wait_for(lock, timeout) == std::cv_status::timeout) {
- // We timed out, now remove the pending wait.
</del><ins>+ std::cv_status status = m_waitForMessageCondition.wait_for(lock, timeout);
+ if (status == std::cv_status::timeout || m_messageWaitingInterruptedByClosedConnection) {
+ // We timed out or lost our connection, now remove the pending wait.
</ins><span class="cx"> m_waitForMessageMap.remove(messageAndDestination);
</span><span class="cx">
</span><ins>+ // If there are no more waiters, reset m_messageWaitingInterruptedByClosedConnection while we already hold
+ // the necessary lock in case the connection is later reopened.
+ if (m_waitForMessageMap.isEmpty())
+ m_messageWaitingInterruptedByClosedConnection = false;
+
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -676,6 +683,12 @@
</span><span class="cx"> iter->value->semaphore.signal();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ {
+ std::lock_guard<std::mutex> lock(m_waitForMessageMutex);
+ m_messageWaitingInterruptedByClosedConnection = true;
+ }
+ m_waitForMessageCondition.notify_all();
+
</ins><span class="cx"> if (m_didCloseOnConnectionWorkQueueCallback)
</span><span class="cx"> m_didCloseOnConnectionWorkQueueCallback(this);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (169050 => 169051)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-05-19 17:50:49 UTC (rev 169050)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-05-19 18:00:10 UTC (rev 169051)
</span><span class="lines">@@ -247,6 +247,7 @@
</span><span class="cx">
</span><span class="cx"> std::condition_variable m_waitForMessageCondition;
</span><span class="cx"> std::mutex m_waitForMessageMutex;
</span><ins>+ bool m_messageWaitingInterruptedByClosedConnection;
</ins><span class="cx"> HashMap<std::pair<std::pair<StringReference, StringReference>, uint64_t>, std::unique_ptr<MessageDecoder>> m_waitForMessageMap;
</span><span class="cx">
</span><span class="cx"> // Represents a sync request for which we're waiting on a reply.
</span></span></pre>
</div>
</div>
</body>
</html>