<!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>[191788] trunk/Source</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/191788">191788</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-30 05:46:55 -0700 (Fri, 30 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Move the socket polling off the WorkQueue
https://bugs.webkit.org/show_bug.cgi?id=150593
Reviewed by Anders Carlsson.
Source/WebKit2:
Create the socket poll source in Connection::open and attach it to
the connection work queue context.
* Platform/IPC/Connection.h:
* Platform/IPC/unix/ConnectionUnix.cpp:
(IPC::Connection::platformInvalidate):
(IPC::Connection::open):
Source/WTF:
It doesn't really belong to the WorkQueue, it's only used by the
WebKit2 connection, so it can be moved there.
* wtf/WorkQueue.h:
* wtf/glib/WorkQueueGLib.cpp:
(WTF::WorkQueue::registerSocketEventHandler): Deleted.
(WTF::WorkQueue::unregisterSocketEventHandler): Deleted.</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="#trunkSourceWTFwtfglibWorkQueueGLibcpp">trunk/Source/WTF/wtf/glib/WorkQueueGLib.cpp</a></li>
<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="#trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp">trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (191787 => 191788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-10-30 12:12:09 UTC (rev 191787)
+++ trunk/Source/WTF/ChangeLog 2015-10-30 12:46:55 UTC (rev 191788)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-10-30 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] Move the socket polling off the WorkQueue
+ https://bugs.webkit.org/show_bug.cgi?id=150593
+
+ Reviewed by Anders Carlsson.
+
+ It doesn't really belong to the WorkQueue, it's only used by the
+ WebKit2 connection, so it can be moved there.
+
+ * wtf/WorkQueue.h:
+ * wtf/glib/WorkQueueGLib.cpp:
+ (WTF::WorkQueue::registerSocketEventHandler): Deleted.
+ (WTF::WorkQueue::unregisterSocketEventHandler): Deleted.
+
</ins><span class="cx"> 2015-10-29 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use a persistent main loop source in RunLoop glib implementation
</span></span></pre></div>
<a id="trunkSourceWTFwtfWorkQueueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/WorkQueue.h (191787 => 191788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/WorkQueue.h 2015-10-30 12:12:09 UTC (rev 191787)
+++ trunk/Source/WTF/wtf/WorkQueue.h 2015-10-30 12:46:55 UTC (rev 191788)
</span><span class="lines">@@ -76,8 +76,7 @@
</span><span class="cx"> #if OS(DARWIN)
</span><span class="cx"> dispatch_queue_t dispatchQueue() const { return m_dispatchQueue; }
</span><span class="cx"> #elif PLATFORM(GTK)
</span><del>- void registerSocketEventHandler(int, std::function<void ()>, std::function<void ()>);
- void unregisterSocketEventHandler(int);
</del><ins>+ GMainContext* mainContext() const { return m_eventContext.get(); }
</ins><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> void registerSocketEventHandler(int, std::function<void ()>);
</span><span class="cx"> void unregisterSocketEventHandler(int);
</span><span class="lines">@@ -109,7 +108,6 @@
</span><span class="cx"> ThreadIdentifier m_workQueueThread;
</span><span class="cx"> GRefPtr<GMainContext> m_eventContext;
</span><span class="cx"> GRefPtr<GMainLoop> m_eventLoop;
</span><del>- GMainLoopSource m_socketEventSource;
</del><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> RefPtr<DispatchQueue> m_dispatchQueue;
</span><span class="cx"> #elif OS(WINDOWS)
</span></span></pre></div>
<a id="trunkSourceWTFwtfglibWorkQueueGLibcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/glib/WorkQueueGLib.cpp (191787 => 191788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/glib/WorkQueueGLib.cpp 2015-10-30 12:12:09 UTC (rev 191787)
+++ trunk/Source/WTF/wtf/glib/WorkQueueGLib.cpp 2015-10-30 12:46:55 UTC (rev 191788)
</span><span class="lines">@@ -28,7 +28,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WorkQueue.h"
</span><span class="cx">
</span><del>-#include <gio/gio.h>
</del><ins>+#include <glib.h>
</ins><span class="cx"> #include <string.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -84,33 +84,6 @@
</span><span class="cx"> m_eventContext = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkQueue::registerSocketEventHandler(int fileDescriptor, std::function<void ()> function, std::function<void ()> closeFunction)
-{
- GRefPtr<GSocket> socket = adoptGRef(g_socket_new_from_fd(fileDescriptor, 0));
- ref();
- m_socketEventSource.schedule("[WebKit] WorkQueue::SocketEventHandler", [function, closeFunction](GIOCondition condition) {
- if (condition & G_IO_HUP || condition & G_IO_ERR || condition & G_IO_NVAL) {
- closeFunction();
- return GMainLoopSource::Stop;
- }
-
- if (condition & G_IO_IN) {
- function();
- return GMainLoopSource::Continue;
- }
-
- ASSERT_NOT_REACHED();
- return GMainLoopSource::Stop;
- }, socket.get(), G_IO_IN,
- [this] { deref(); },
- m_eventContext.get());
-}
-
-void WorkQueue::unregisterSocketEventHandler(int)
-{
- m_socketEventSource.cancel();
-}
-
</del><span class="cx"> void WorkQueue::dispatch(std::function<void ()> function)
</span><span class="cx"> {
</span><span class="cx"> ref();
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191787 => 191788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-30 12:12:09 UTC (rev 191787)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-30 12:46:55 UTC (rev 191788)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-10-30 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Move the socket polling off the WorkQueue
+ https://bugs.webkit.org/show_bug.cgi?id=150593
+
+ Reviewed by Anders Carlsson.
+
+ Create the socket poll source in Connection::open and attach it to
+ the connection work queue context.
+
+ * Platform/IPC/Connection.h:
+ * Platform/IPC/unix/ConnectionUnix.cpp:
+ (IPC::Connection::platformInvalidate):
+ (IPC::Connection::open):
+
+2015-10-30 Carlos Garcia Campos <cgarcia@igalia.com>
+
</ins><span class="cx"> [GTK] Use RunLoop::Timer instead of GMainLoopSource
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150592
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (191787 => 191788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2015-10-30 12:12:09 UTC (rev 191787)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2015-10-30 12:46:55 UTC (rev 191788)
</span><span class="lines">@@ -52,6 +52,10 @@
</span><span class="cx"> #include "PlatformProcessIdentifier.h"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if PLATFORM(GTK)
+#include <wtf/glib/GMainLoopSource.h>
+#endif
+
</ins><span class="cx"> namespace IPC {
</span><span class="cx">
</span><span class="cx"> struct WaitForMessageState;
</span><span class="lines">@@ -354,7 +358,10 @@
</span><span class="cx"> Vector<int> m_fileDescriptors;
</span><span class="cx"> size_t m_fileDescriptorsSize;
</span><span class="cx"> int m_socketDescriptor;
</span><ins>+#if PLATFORM(GTK)
+ GMainLoopSource m_socketEventSource;
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T> bool Connection::send(T&& message, uint64_t destinationID, unsigned messageSendFlags)
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (191787 => 191788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2015-10-30 12:12:09 UTC (rev 191787)
+++ trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2015-10-30 12:46:55 UTC (rev 191788)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> #include <wtf/UniStdExtras.h>
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>-#include <glib.h>
</del><ins>+#include <gio/gio.h>
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifdef SOCK_SEQPACKET
</span><span class="lines">@@ -147,7 +147,9 @@
</span><span class="cx"> if (!m_isConnected)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>-#if PLATFORM(GTK) || PLATFORM(EFL)
</del><ins>+#if PLATFORM(GTK)
+ m_socketEventSource.cancel();
+#elif PLATFORM(EFL)
</ins><span class="cx"> m_connectionQueue->unregisterSocketEventHandler(m_socketDescriptor);
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -374,13 +376,21 @@
</span><span class="cx"> RefPtr<Connection> protectedThis(this);
</span><span class="cx"> m_isConnected = true;
</span><span class="cx"> #if PLATFORM(GTK)
</span><del>- m_connectionQueue->registerSocketEventHandler(m_socketDescriptor,
- [protectedThis] {
</del><ins>+ GRefPtr<GSocket> socket = adoptGRef(g_socket_new_from_fd(m_socketDescriptor, nullptr));
+ m_socketEventSource.schedule("[WebKit] Connection::SocketEventHandler", [protectedThis] (GIOCondition condition) {
+ if (condition & G_IO_HUP || condition & G_IO_ERR || condition & G_IO_NVAL) {
+ protectedThis->connectionDidClose();
+ return GMainLoopSource::Stop;
+ }
+
+ if (condition & G_IO_IN) {
</ins><span class="cx"> protectedThis->readyReadHandler();
</span><del>- },
- [protectedThis] {
- protectedThis->connectionDidClose();
- });
</del><ins>+ return GMainLoopSource::Continue;
+ }
+
+ ASSERT_NOT_REACHED();
+ return GMainLoopSource::Stop;
+ }, socket.get(), G_IO_IN, nullptr, m_connectionQueue->mainContext());
</ins><span class="cx"> #elif PLATFORM(EFL)
</span><span class="cx"> m_connectionQueue->registerSocketEventHandler(m_socketDescriptor,
</span><span class="cx"> [protectedThis] {
</span></span></pre>
</div>
</div>
</body>
</html>