<!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>[209481] 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/209481">209481</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-12-07 14:30:58 -0800 (Wed, 07 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename the connection sources to better indicate what data direction they are used for
https://bugs.webkit.org/show_bug.cgi?id=165548
Reviewed by Tim Horton.
* Platform/IPC/Connection.h:
* Platform/IPC/mac/ConnectionMac.mm:
(IPC::Connection::platformInvalidate):
(IPC::Connection::platformInitialize):
(IPC::createReceiveSource):
(IPC::Connection::initializeSendSource):
(IPC::Connection::receiveSourceEventHandler):
(IPC::createDataAvailableSource): Deleted.
(IPC::Connection::initializeDeadNameSource): Deleted.
Rename m_deadNameSource to m_sendSource, and m_receivePortDataAvailableSource to m_receiveSource.
(IPC::Connection::open):
Initialize the send source before we attempt to send a first message.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (209480 => 209481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-12-07 22:28:58 UTC (rev 209480)
+++ trunk/Source/WebKit2/ChangeLog 2016-12-07 22:30:58 UTC (rev 209481)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-12-07 Anders Carlsson <andersca@apple.com>
+
+ Rename the connection sources to better indicate what data direction they are used for
+ https://bugs.webkit.org/show_bug.cgi?id=165548
+
+ Reviewed by Tim Horton.
+
+ * Platform/IPC/Connection.h:
+ * Platform/IPC/mac/ConnectionMac.mm:
+ (IPC::Connection::platformInvalidate):
+ (IPC::Connection::platformInitialize):
+ (IPC::createReceiveSource):
+ (IPC::Connection::initializeSendSource):
+ (IPC::Connection::receiveSourceEventHandler):
+ (IPC::createDataAvailableSource): Deleted.
+ (IPC::Connection::initializeDeadNameSource): Deleted.
+ Rename m_deadNameSource to m_sendSource, and m_receivePortDataAvailableSource to m_receiveSource.
+
+ (IPC::Connection::open):
+ Initialize the send source before we attempt to send a first message.
+
</ins><span class="cx"> 2016-12-07 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix use of enum in a WK2 C SPI header.
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (209480 => 209481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-12-07 22:28:58 UTC (rev 209480)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2016-12-07 22:30:58 UTC (rev 209481)
</span><span class="lines">@@ -312,13 +312,13 @@
</span><span class="cx"> #elif OS(DARWIN)
</span><span class="cx"> // Called on the connection queue.
</span><span class="cx"> void receiveSourceEventHandler();
</span><del>- void initializeDeadNameSource();
</del><ins>+ void initializeSendSource();
</ins><span class="cx">
</span><span class="cx"> mach_port_t m_sendPort;
</span><del>- dispatch_source_t m_deadNameSource;
</del><ins>+ dispatch_source_t m_sendSource;
</ins><span class="cx">
</span><span class="cx"> mach_port_t m_receivePort;
</span><del>- dispatch_source_t m_receivePortDataAvailableSource;
</del><ins>+ dispatch_source_t m_receiveSource;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</span><span class="cx"> void exceptionSourceEventHandler();
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (209480 => 209481)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2016-12-07 22:28:58 UTC (rev 209480)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2016-12-07 22:30:58 UTC (rev 209481)
</span><span class="lines">@@ -132,14 +132,14 @@
</span><span class="cx"> ASSERT(m_receivePort);
</span><span class="cx">
</span><span class="cx"> // Unregister our ports.
</span><del>- dispatch_source_cancel(m_deadNameSource);
- dispatch_release(m_deadNameSource);
- m_deadNameSource = 0;
</del><ins>+ dispatch_source_cancel(m_sendSource);
+ dispatch_release(m_sendSource);
+ m_sendSource = 0;
</ins><span class="cx"> m_sendPort = MACH_PORT_NULL;
</span><span class="cx">
</span><del>- dispatch_source_cancel(m_receivePortDataAvailableSource);
- dispatch_release(m_receivePortDataAvailableSource);
- m_receivePortDataAvailableSource = 0;
</del><ins>+ dispatch_source_cancel(m_receiveSource);
+ dispatch_release(m_receiveSource);
+ m_receiveSource = 0;
</ins><span class="cx"> m_receivePort = MACH_PORT_NULL;
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</span><span class="lines">@@ -173,14 +173,14 @@
</span><span class="cx"> m_sendPort = identifier.port;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_deadNameSource = nullptr;
- m_receivePortDataAvailableSource = nullptr;
</del><ins>+ m_sendSource = nullptr;
+ m_receiveSource = nullptr;
</ins><span class="cx">
</span><span class="cx"> m_xpcConnection = identifier.xpcConnection;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename Function>
</span><del>-static dispatch_source_t createDataAvailableSource(mach_port_t receivePort, WorkQueue& workQueue, Function&& function)
</del><ins>+static dispatch_source_t createReceiveSource(mach_port_t receivePort, WorkQueue& workQueue, Function&& function)
</ins><span class="cx"> {
</span><span class="cx"> dispatch_source_t source = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_RECV, receivePort, 0, workQueue.dispatchQueue());
</span><span class="cx"> dispatch_source_set_event_handler(source, function);
</span><span class="lines">@@ -215,9 +215,9 @@
</span><span class="cx"> auto encoder = std::make_unique<Encoder>("IPC", "InitializeConnection", 0);
</span><span class="cx"> encoder->encode(MachPort(m_receivePort, MACH_MSG_TYPE_MAKE_SEND));
</span><span class="cx">
</span><ins>+ initializeSendSource();
+
</ins><span class="cx"> sendMessage(WTFMove(encoder), { });
</span><del>-
- initializeDeadNameSource();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Change the message queue length for the receive port.
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx">
</span><span class="cx"> // Register the data available handler.
</span><span class="cx"> RefPtr<Connection> connection(this);
</span><del>- m_receivePortDataAvailableSource = createDataAvailableSource(m_receivePort, m_connectionQueue, [connection] {
</del><ins>+ m_receiveSource = createReceiveSource(m_receivePort, m_connectionQueue, [connection] {
</ins><span class="cx"> connection->receiveSourceEventHandler();
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -244,10 +244,10 @@
</span><span class="cx">
</span><span class="cx"> ref();
</span><span class="cx"> dispatch_async(m_connectionQueue->dispatchQueue(), ^{
</span><del>- dispatch_resume(m_receivePortDataAvailableSource);
</del><ins>+ dispatch_resume(m_receiveSource);
</ins><span class="cx">
</span><del>- if (m_deadNameSource)
- dispatch_resume(m_deadNameSource);
</del><ins>+ if (m_sendSource)
+ dispatch_resume(m_sendSource);
</ins><span class="cx"> #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 101000
</span><span class="cx"> if (m_exceptionPortDataAvailableSource)
</span><span class="cx"> dispatch_resume(m_exceptionPortDataAvailableSource);
</span><span class="lines">@@ -356,17 +356,17 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Connection::initializeDeadNameSource()
</del><ins>+void Connection::initializeSendSource()
</ins><span class="cx"> {
</span><del>- m_deadNameSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_SEND, m_sendPort, 0, m_connectionQueue->dispatchQueue());
</del><ins>+ m_sendSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_SEND, m_sendPort, 0, m_connectionQueue->dispatchQueue());
</ins><span class="cx">
</span><span class="cx"> RefPtr<Connection> connection(this);
</span><del>- dispatch_source_set_event_handler(m_deadNameSource, [connection] {
</del><ins>+ dispatch_source_set_event_handler(m_sendSource, [connection] {
</ins><span class="cx"> connection->connectionDidClose();
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> mach_port_t sendPort = m_sendPort;
</span><del>- dispatch_source_set_cancel_handler(m_deadNameSource, ^{
</del><ins>+ dispatch_source_set_cancel_handler(m_sendSource, ^{
</ins><span class="cx"> // Release our send right.
</span><span class="cx"> mach_port_deallocate(mach_task_self(), sendPort);
</span><span class="cx"> });
</span><span class="lines">@@ -510,8 +510,8 @@
</span><span class="cx"> if (previousNotificationPort != MACH_PORT_NULL)
</span><span class="cx"> mach_port_deallocate(mach_task_self(), previousNotificationPort);
</span><span class="cx">
</span><del>- initializeDeadNameSource();
- dispatch_resume(m_deadNameSource);
</del><ins>+ initializeSendSource();
+ dispatch_resume(m_sendSource);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_isConnected = true;
</span></span></pre>
</div>
</div>
</body>
</html>