<!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>[166982] trunk/Source/JavaScriptCore</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/166982">166982</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-08 17:12:11 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Prevent deadlocks receiving WIRPermissionDenied message
https://bugs.webkit.org/show_bug.cgi?id=131406
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2014-04-08
Reviewed by Timothy Hatcher.
* inspector/remote/RemoteInspector.h:
* inspector/remote/RemoteInspector.mm:
(Inspector::RemoteInspector::stop):
(Inspector::RemoteInspector::stopInternal):
(Inspector::RemoteInspector::xpcConnectionReceivedMessage):
Provide a way to stop externally and a path to stop when in
the middle of handling a message already with the locked mutex.
* inspector/remote/RemoteInspectorXPCConnection.h:
* inspector/remote/RemoteInspectorXPCConnection.mm:
(Inspector::RemoteInspectorXPCConnection::close):
(Inspector::RemoteInspectorXPCConnection::closeFromMessage):
Provide a way to close externally and a path to close when in
the middle of handling a message already with a mutex.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionh">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionmm">trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (166981 => 166982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-04-09 00:06:09 UTC (rev 166981)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-04-09 00:12:11 UTC (rev 166982)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2014-04-08 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: Prevent deadlocks receiving WIRPermissionDenied message
+ https://bugs.webkit.org/show_bug.cgi?id=131406
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/remote/RemoteInspector.h:
+ * inspector/remote/RemoteInspector.mm:
+ (Inspector::RemoteInspector::stop):
+ (Inspector::RemoteInspector::stopInternal):
+ (Inspector::RemoteInspector::xpcConnectionReceivedMessage):
+ Provide a way to stop externally and a path to stop when in
+ the middle of handling a message already with the locked mutex.
+
+ * inspector/remote/RemoteInspectorXPCConnection.h:
+ * inspector/remote/RemoteInspectorXPCConnection.mm:
+ (Inspector::RemoteInspectorXPCConnection::close):
+ (Inspector::RemoteInspectorXPCConnection::closeFromMessage):
+ Provide a way to close externally and a path to close when in
+ the middle of handling a message already with a mutex.
+
+2014-04-08 Joseph Pecoraro <pecoraro@apple.com>
+
</ins><span class="cx"> Web Inspector: Address stale FIXMEs concerning console in JSContext inspection
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131398
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h (166981 => 166982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h 2014-04-09 00:06:09 UTC (rev 166981)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.h 2014-04-09 00:12:11 UTC (rev 166982)
</span><span class="lines">@@ -65,6 +65,9 @@
</span><span class="cx">
</span><span class="cx"> unsigned nextAvailableIdentifier();
</span><span class="cx">
</span><ins>+ enum class StopSource { API, XPCMessage };
+ void stopInternal(StopSource);
+
</ins><span class="cx"> void setupXPCConnectionIfNeeded();
</span><span class="cx">
</span><span class="cx"> NSDictionary *listingForDebuggable(const RemoteInspectorDebuggableInfo&) const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm (166981 => 166982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2014-04-09 00:06:09 UTC (rev 166981)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspector.mm 2014-04-09 00:12:11 UTC (rev 166982)
</span><span class="lines">@@ -196,6 +196,11 @@
</span><span class="cx"> {
</span><span class="cx"> std::lock_guard<std::mutex> lock(m_mutex);
</span><span class="cx">
</span><ins>+ stopInternal(StopSource::API);
+}
+
+void RemoteInspector::stopInternal(StopSource source)
+{
</ins><span class="cx"> if (!m_enabled)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -210,7 +215,15 @@
</span><span class="cx"> updateHasActiveDebugSession();
</span><span class="cx">
</span><span class="cx"> if (m_xpcConnection) {
</span><del>- m_xpcConnection->close();
</del><ins>+ switch (source) {
+ case StopSource::API:
+ m_xpcConnection->close();
+ break;
+ case StopSource::XPCMessage:
+ m_xpcConnection->closeFromMessage();
+ break;
+ }
+
</ins><span class="cx"> m_xpcConnection = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -239,13 +252,13 @@
</span><span class="cx">
</span><span class="cx"> void RemoteInspector::xpcConnectionReceivedMessage(RemoteInspectorXPCConnection*, NSString *messageName, NSDictionary *userInfo)
</span><span class="cx"> {
</span><ins>+ std::lock_guard<std::mutex> lock(m_mutex);
+
</ins><span class="cx"> if ([messageName isEqualToString:WIRPermissionDenied]) {
</span><del>- stop();
</del><ins>+ stopInternal(StopSource::XPCMessage);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- std::lock_guard<std::mutex> lock(m_mutex);
-
</del><span class="cx"> if ([messageName isEqualToString:WIRSocketDataMessage])
</span><span class="cx"> receivedDataMessage(userInfo);
</span><span class="cx"> else if ([messageName isEqualToString:WIRSocketSetupMessage])
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h (166981 => 166982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h 2014-04-09 00:06:09 UTC (rev 166981)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.h 2014-04-09 00:12:11 UTC (rev 166982)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> virtual ~RemoteInspectorXPCConnection();
</span><span class="cx">
</span><span class="cx"> void close();
</span><ins>+ void closeFromMessage();
</ins><span class="cx"> void sendMessage(NSString *messageName, NSDictionary *userInfo);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorremoteRemoteInspectorXPCConnectionmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm (166981 => 166982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm 2014-04-09 00:06:09 UTC (rev 166981)
+++ trunk/Source/JavaScriptCore/inspector/remote/RemoteInspectorXPCConnection.mm 2014-04-09 00:12:11 UTC (rev 166982)
</span><span class="lines">@@ -76,7 +76,11 @@
</span><span class="cx"> void RemoteInspectorXPCConnection::close()
</span><span class="cx"> {
</span><span class="cx"> std::lock_guard<std::mutex> lock(m_mutex);
</span><ins>+ closeFromMessage();
+}
</ins><span class="cx">
</span><ins>+void RemoteInspectorXPCConnection::closeFromMessage()
+{
</ins><span class="cx"> m_closed = true;
</span><span class="cx"> m_client = nullptr;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>