<!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>[165878] releases/WebKitGTK/webkit-2.2/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/165878">165878</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-19 01:23:38 -0700 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/165745">r165745</a> - [GTK] Don't busy loop when the socket is full
https://bugs.webkit.org/show_bug.cgi?id=129802
Patch by Giovanni Campagna <gcampagna@src.gnome.org> on 2014-03-17
Reviewed by Carlos Garcia Campos.
When the socket is full and we see EAGAIN or EWOULDBLOCK
(because the socket is non blocking), don't busy loop by
tring to write again, instead poll() until the socket
becomes writable.
* Platform/IPC/unix/ConnectionUnix.cpp:
(IPC::Connection::sendOutgoingMessage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit22SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit22SourceWebKit2PlatformCoreIPCunixConnectionUnixcpp">releases/WebKitGTK/webkit-2.2/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit22SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog (165877 => 165878)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2014-03-19 08:04:52 UTC (rev 165877)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/ChangeLog 2014-03-19 08:23:38 UTC (rev 165878)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-17 Giovanni Campagna <gcampagna@src.gnome.org>
+
+ [GTK] Don't busy loop when the socket is full
+ https://bugs.webkit.org/show_bug.cgi?id=129802
+
+ Reviewed by Carlos Garcia Campos.
+
+ When the socket is full and we see EAGAIN or EWOULDBLOCK
+ (because the socket is non blocking), don't busy loop by
+ tring to write again, instead poll() until the socket
+ becomes writable.
+
+ * Platform/IPC/unix/ConnectionUnix.cpp:
+ (IPC::Connection::sendOutgoingMessage):
+
</ins><span class="cx"> 2014-02-27 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Web Inspector doesn't work with network process enabled
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit22SourceWebKit2PlatformCoreIPCunixConnectionUnixcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.2/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp (165877 => 165878)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.2/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2014-03-19 08:04:52 UTC (rev 165877)
+++ releases/WebKitGTK/webkit-2.2/Source/WebKit2/Platform/CoreIPC/unix/ConnectionUnix.cpp 2014-03-19 08:23:38 UTC (rev 165878)
</span><span class="lines">@@ -34,6 +34,7 @@
</span><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <errno.h>
</span><span class="cx"> #include <fcntl.h>
</span><ins>+#include <poll.h>
</ins><span class="cx"> #include <wtf/Assertions.h>
</span><span class="cx"> #include <wtf/Functional.h>
</span><span class="cx"> #include <wtf/OwnArrayPtr.h>
</span><span class="lines">@@ -555,9 +556,18 @@
</span><span class="cx">
</span><span class="cx"> int bytesSent = 0;
</span><span class="cx"> while ((bytesSent = sendmsg(m_socketDescriptor, &message, 0)) == -1) {
</span><del>- if (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK)
</del><ins>+ if (errno == EINTR)
</ins><span class="cx"> continue;
</span><ins>+ if (errno == EAGAIN || errno == EWOULDBLOCK) {
+ struct pollfd pollfd;
</ins><span class="cx">
</span><ins>+ pollfd.fd = m_socketDescriptor;
+ pollfd.events = POLLOUT;
+ pollfd.revents = 0;
+ poll(&pollfd, 1, -1);
+ continue;
+ }
+
</ins><span class="cx"> WTFLogAlways("Error sending IPC message: %s", strerror(errno));
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>