<!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>[202370] trunk/Source/WebCore</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/202370">202370</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-06-23 00:23:19 -0700 (Thu, 23 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Soup] Clean up SocketStreamHandle soup implementation
https://bugs.webkit.org/show_bug.cgi?id=159024
Reviewed by Žan Doberšek.
Stop using a global HashMap to "acivate"/"deactivate" handles, and just take a reference of the handle and
pass the ownership to the callbacks, using a GCancellable to cancel all async operations.
* platform/network/soup/SocketStreamHandle.h:
(WebCore::SocketStreamHandle::create):
(WebCore::SocketStreamHandle::id): Deleted.
* platform/network/soup/SocketStreamHandleSoup.cpp:
(WebCore::SocketStreamHandle::SocketStreamHandle):
(WebCore::SocketStreamHandle::connected):
(WebCore::SocketStreamHandle::connectedCallback):
(WebCore::SocketStreamHandle::readBytes):
(WebCore::SocketStreamHandle::readReadyCallback):
(WebCore::SocketStreamHandle::didFail):
(WebCore::SocketStreamHandle::platformSend):
(WebCore::SocketStreamHandle::platformClose):
(WebCore::SocketStreamHandle::beginWaitingForSocketWritability):
(WebCore::SocketStreamHandle::writeReadyCallback):
(WebCore::getHandleFromId): Deleted.
(WebCore::deactivateHandle): Deleted.
(WebCore::activateHandle): Deleted.
(WebCore::SocketStreamHandle::~SocketStreamHandle): Deleted.
(WebCore::connectedCallback): Deleted.
(WebCore::readReadyCallback): Deleted.
(WebCore::writeReadyCallback): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh">trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202369 => 202370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-23 06:44:02 UTC (rev 202369)
+++ trunk/Source/WebCore/ChangeLog 2016-06-23 07:23:19 UTC (rev 202370)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-06-23 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [Soup] Clean up SocketStreamHandle soup implementation
+ https://bugs.webkit.org/show_bug.cgi?id=159024
+
+ Reviewed by Žan Doberšek.
+
+ Stop using a global HashMap to "acivate"/"deactivate" handles, and just take a reference of the handle and
+ pass the ownership to the callbacks, using a GCancellable to cancel all async operations.
+
+ * platform/network/soup/SocketStreamHandle.h:
+ (WebCore::SocketStreamHandle::create):
+ (WebCore::SocketStreamHandle::id): Deleted.
+ * platform/network/soup/SocketStreamHandleSoup.cpp:
+ (WebCore::SocketStreamHandle::SocketStreamHandle):
+ (WebCore::SocketStreamHandle::connected):
+ (WebCore::SocketStreamHandle::connectedCallback):
+ (WebCore::SocketStreamHandle::readBytes):
+ (WebCore::SocketStreamHandle::readReadyCallback):
+ (WebCore::SocketStreamHandle::didFail):
+ (WebCore::SocketStreamHandle::platformSend):
+ (WebCore::SocketStreamHandle::platformClose):
+ (WebCore::SocketStreamHandle::beginWaitingForSocketWritability):
+ (WebCore::SocketStreamHandle::writeReadyCallback):
+ (WebCore::getHandleFromId): Deleted.
+ (WebCore::deactivateHandle): Deleted.
+ (WebCore::activateHandle): Deleted.
+ (WebCore::SocketStreamHandle::~SocketStreamHandle): Deleted.
+ (WebCore::connectedCallback): Deleted.
+ (WebCore::readReadyCallback): Deleted.
+ (WebCore::writeReadyCallback): Deleted.
+
</ins><span class="cx"> 2016-06-22 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> DatabaseProcess doesn't handle WebProcesses going away uncleanly.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h (202369 => 202370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-06-23 06:44:02 UTC (rev 202369)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-06-23 07:23:19 UTC (rev 202370)
</span><span class="lines">@@ -37,45 +37,49 @@
</span><span class="cx">
</span><span class="cx"> #if USE(SOUP)
</span><span class="cx">
</span><del>-#include <wtf/PassRefPtr.h>
</del><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/glib/GRefPtr.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>- class NetworkingContext;
- class SocketStreamHandleClient;
</del><ins>+class NetworkingContext;
+class SocketStreamError;
+class SocketStreamHandleClient;
</ins><span class="cx">
</span><del>- class SocketStreamHandle : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
- public:
- static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient* client, NetworkingContext&, bool) { return adoptRef(*new SocketStreamHandle(url, client)); }
- static Ref<SocketStreamHandle> create(GSocketConnection* socketConnection, SocketStreamHandleClient* client) { return adoptRef(*new SocketStreamHandle(socketConnection, client)); }
</del><ins>+class SocketStreamHandle final : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
+public:
+ static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient* client, NetworkingContext&, bool) { return adoptRef(*new SocketStreamHandle(url, client)); }
+ static Ref<SocketStreamHandle> create(GSocketConnection* socketConnection, SocketStreamHandleClient* client) { return adoptRef(*new SocketStreamHandle(socketConnection, client)); }
</ins><span class="cx">
</span><del>- virtual ~SocketStreamHandle();
- void connected(GSocketConnection*, GError*);
- void readBytes(signed long, GError*);
- void writeReady();
- void* id() { return m_id; }
</del><ins>+ virtual ~SocketStreamHandle();
</ins><span class="cx">
</span><del>- protected:
- virtual int platformSend(const char* data, int length);
- virtual void platformClose();
</del><ins>+private:
+ SocketStreamHandle(const URL&, SocketStreamHandleClient*);
+ SocketStreamHandle(GSocketConnection*, SocketStreamHandleClient*);
</ins><span class="cx">
</span><del>- private:
- GRefPtr<GSocketConnection> m_socketConnection;
- GRefPtr<GInputStream> m_inputStream;
- GRefPtr<GPollableOutputStream> m_outputStream;
- GRefPtr<GSource> m_writeReadySource;
- std::unique_ptr<char[]> m_readBuffer;
- void* m_id;
</del><ins>+ int platformSend(const char* data, int length) override;
+ void platformClose() override;
</ins><span class="cx">
</span><del>- SocketStreamHandle(const URL&, SocketStreamHandleClient*);
- SocketStreamHandle(GSocketConnection*, SocketStreamHandleClient*);
</del><ins>+ void beginWaitingForSocketWritability();
+ void stopWaitingForSocketWritability();
</ins><span class="cx">
</span><del>- void beginWaitingForSocketWritability();
- void stopWaitingForSocketWritability();
- };
</del><ins>+ static void connectedCallback(GSocketClient*, GAsyncResult*, SocketStreamHandle*);
+ static void readReadyCallback(GInputStream*, GAsyncResult*, SocketStreamHandle*);
+ static gboolean writeReadyCallback(GPollableOutputStream*, SocketStreamHandle*);
</ins><span class="cx">
</span><ins>+ void connected(GRefPtr<GSocketConnection>&&);
+ void readBytes(gssize);
+ void didFail(SocketStreamError&&);
+ void writeReady();
+
+ GRefPtr<GSocketConnection> m_socketConnection;
+ GRefPtr<GInputStream> m_inputStream;
+ GRefPtr<GPollableOutputStream> m_outputStream;
+ GRefPtr<GSource> m_writeReadySource;
+ GRefPtr<GCancellable> m_cancellable;
+ std::unique_ptr<char[]> m_readBuffer;
+};
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp (202369 => 202370)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-06-23 06:44:02 UTC (rev 202369)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-06-23 07:23:19 UTC (rev 202370)
</span><span class="lines">@@ -38,10 +38,8 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "SocketStreamError.h"
</span><span class="cx"> #include "SocketStreamHandleClient.h"
</span><del>-
</del><span class="cx"> #include <gio/gio.h>
</span><span class="cx"> #include <glib.h>
</span><del>-
</del><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/glib/GUniquePtr.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -50,93 +48,74 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-// These functions immediately call the similarly named SocketStreamHandle methods.
-static void connectedCallback(GSocketClient*, GAsyncResult*, void*);
-static void readReadyCallback(GInputStream*, GAsyncResult*, void*);
-static gboolean writeReadyCallback(GPollableOutputStream*, void*);
-
-// Having a list of active handles means that we do not have to worry about WebCore
-// reference counting in GLib callbacks. Once the handle is off the active handles list
-// we just ignore it in the callback. We avoid a lot of extra checks and tricky
-// situations this way.
-static HashMap<void*, SocketStreamHandle*> gActiveHandles;
-COMPILE_ASSERT(HashTraits<SocketStreamHandle*>::emptyValueIsZero, emptyMapValue_is_0);
-
-static SocketStreamHandle* getHandleFromId(void* id)
-{
- return gActiveHandles.get(id);
-}
-
-static void deactivateHandle(SocketStreamHandle& handle)
-{
- gActiveHandles.remove(handle.id());
-}
-
-static void* activateHandle(SocketStreamHandle& handle)
-{
- // The first id cannot be 0, because it conflicts with the HashMap emptyValue.
- static gint currentHandleId = 1;
- void* id = GINT_TO_POINTER(currentHandleId++);
- gActiveHandles.set(id, &handle);
- return id;
-}
-
</del><span class="cx"> SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient* client)
</span><span class="cx"> : SocketStreamHandleBase(url, client)
</span><ins>+ , m_cancellable(adoptGRef(g_cancellable_new()))
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
</span><del>- unsigned int port = url.hasPort() ? url.port() : (url.protocolIs("wss") ? 443 : 80);
</del><ins>+ unsigned port = url.hasPort() ? url.port() : (url.protocolIs("wss") ? 443 : 80);
</ins><span class="cx">
</span><del>- m_id = activateHandle(*this);
</del><span class="cx"> GRefPtr<GSocketClient> socketClient = adoptGRef(g_socket_client_new());
</span><span class="cx"> if (url.protocolIs("wss"))
</span><span class="cx"> g_socket_client_set_tls(socketClient.get(), TRUE);
</span><del>- g_socket_client_connect_to_host_async(socketClient.get(), url.host().utf8().data(), port, 0,
- reinterpret_cast<GAsyncReadyCallback>(connectedCallback), m_id);
</del><ins>+ RefPtr<SocketStreamHandle> protectedThis(this);
+ g_socket_client_connect_to_host_async(socketClient.get(), url.host().utf8().data(), port, m_cancellable.get(),
+ reinterpret_cast<GAsyncReadyCallback>(connectedCallback), protectedThis.leakRef());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SocketStreamHandle::SocketStreamHandle(GSocketConnection* socketConnection, SocketStreamHandleClient* client)
</span><span class="cx"> : SocketStreamHandleBase(URL(), client)
</span><ins>+ , m_cancellable(adoptGRef(g_cancellable_new()))
</ins><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p new client %p", this, m_client);
</span><del>- m_id = activateHandle(*this);
- connected(socketConnection, 0);
</del><ins>+ GRefPtr<GSocketConnection> connection = socketConnection;
+ connected(WTFMove(connection));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SocketStreamHandle::~SocketStreamHandle()
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p delete", this);
</span><del>- // If for some reason we were destroyed without closing, ensure that we are deactivated.
- deactivateHandle(*this);
</del><span class="cx"> setClient(nullptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SocketStreamHandle::connected(GSocketConnection* socketConnection, GError* error)
</del><ins>+void SocketStreamHandle::connected(GRefPtr<GSocketConnection>&& socketConnection)
</ins><span class="cx"> {
</span><del>- if (error) {
- m_client->didFailSocketStream(*this, SocketStreamError(error->code, error->message));
- return;
- }
-
- m_socketConnection = socketConnection;
</del><ins>+ m_socketConnection = WTFMove(socketConnection);
</ins><span class="cx"> m_outputStream = G_POLLABLE_OUTPUT_STREAM(g_io_stream_get_output_stream(G_IO_STREAM(m_socketConnection.get())));
</span><span class="cx"> m_inputStream = g_io_stream_get_input_stream(G_IO_STREAM(m_socketConnection.get()));
</span><del>-
</del><span class="cx"> m_readBuffer = std::make_unique<char[]>(READ_BUFFER_SIZE);
</span><del>- g_input_stream_read_async(m_inputStream.get(), m_readBuffer.get(), READ_BUFFER_SIZE, G_PRIORITY_DEFAULT, 0,
- reinterpret_cast<GAsyncReadyCallback>(readReadyCallback), m_id);
</del><span class="cx">
</span><ins>+ RefPtr<SocketStreamHandle> protectedThis(this);
+ g_input_stream_read_async(m_inputStream.get(), m_readBuffer.get(), READ_BUFFER_SIZE, G_PRIORITY_DEFAULT, m_cancellable.get(),
+ reinterpret_cast<GAsyncReadyCallback>(readReadyCallback), protectedThis.leakRef());
+
</ins><span class="cx"> m_state = Open;
</span><span class="cx"> m_client->didOpenSocketStream(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SocketStreamHandle::readBytes(signed long bytesRead, GError* error)
</del><ins>+void SocketStreamHandle::connectedCallback(GSocketClient* client, GAsyncResult* result, SocketStreamHandle* handle)
</ins><span class="cx"> {
</span><del>- if (error) {
- m_client->didFailSocketStream(*this, SocketStreamError(error->code, error->message));
</del><ins>+ RefPtr<SocketStreamHandle> protectedThis = adoptRef(handle);
+
+ // Always finish the connection, even if this SocketStreamHandle was cancelled earlier.
+ GUniqueOutPtr<GError> error;
+ GRefPtr<GSocketConnection> socketConnection = adoptGRef(g_socket_client_connect_to_host_finish(client, result, &error.outPtr()));
+
+ // The SocketStreamHandle has been cancelled, so just close the connection, ignoring errors.
+ if (g_cancellable_is_cancelled(handle->m_cancellable.get())) {
+ if (socketConnection)
+ g_io_stream_close(G_IO_STREAM(socketConnection.get()), nullptr, nullptr);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (error)
+ handle->didFail(SocketStreamError(error->code, error->message));
+ else
+ handle->connected(WTFMove(socketConnection));
+}
+
+void SocketStreamHandle::readBytes(gssize bytesRead)
+{
</ins><span class="cx"> if (!bytesRead) {
</span><span class="cx"> close();
</span><span class="cx"> return;
</span><span class="lines">@@ -143,13 +122,36 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // The client can close the handle, potentially removing the last reference.
</span><del>- Ref<SocketStreamHandle> protectedThis(*this);
</del><ins>+ RefPtr<SocketStreamHandle> protectedThis(this);
</ins><span class="cx"> m_client->didReceiveSocketStreamData(*this, m_readBuffer.get(), bytesRead);
</span><del>- if (m_inputStream) // The client may have closed the connection.
- g_input_stream_read_async(m_inputStream.get(), m_readBuffer.get(), READ_BUFFER_SIZE, G_PRIORITY_DEFAULT, 0,
- reinterpret_cast<GAsyncReadyCallback>(readReadyCallback), m_id);
</del><ins>+ if (m_inputStream) {
+ g_input_stream_read_async(m_inputStream.get(), m_readBuffer.get(), READ_BUFFER_SIZE, G_PRIORITY_DEFAULT, m_cancellable.get(),
+ reinterpret_cast<GAsyncReadyCallback>(readReadyCallback), protectedThis.leakRef());
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void SocketStreamHandle::readReadyCallback(GInputStream* stream, GAsyncResult* result, SocketStreamHandle* handle)
+{
+ RefPtr<SocketStreamHandle> protectedThis = adoptRef(handle);
+
+ // Always finish the read, even if this SocketStreamHandle was cancelled earlier.
+ GUniqueOutPtr<GError> error;
+ gssize bytesRead = g_input_stream_read_finish(stream, result, &error.outPtr());
+
+ if (g_cancellable_is_cancelled(handle->m_cancellable.get()))
+ return;
+
+ if (error)
+ handle->didFail(SocketStreamError(error->code, error->message));
+ else
+ handle->readBytes(bytesRead);
+}
+
+void SocketStreamHandle::didFail(SocketStreamError&& error)
+{
+ m_client->didFailSocketStream(*this, WTFMove(error));
+}
+
</ins><span class="cx"> void SocketStreamHandle::writeReady()
</span><span class="cx"> {
</span><span class="cx"> // We no longer have buffered data, so stop waiting for the socket to be writable.
</span><span class="lines">@@ -168,12 +170,12 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> GUniqueOutPtr<GError> error;
</span><del>- gssize written = g_pollable_output_stream_write_nonblocking(m_outputStream.get(), data, length, 0, &error.outPtr());
</del><ins>+ gssize written = g_pollable_output_stream_write_nonblocking(m_outputStream.get(), data, length, m_cancellable.get(), &error.outPtr());
</ins><span class="cx"> if (error) {
</span><span class="cx"> if (g_error_matches(error.get(), G_IO_ERROR, G_IO_ERROR_WOULD_BLOCK))
</span><span class="cx"> beginWaitingForSocketWritability();
</span><span class="cx"> else
</span><del>- m_client->didFailSocketStream(*this, SocketStreamError(error->code, error->message));
</del><ins>+ didFail(SocketStreamError(error->code, error->message));
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -188,20 +190,20 @@
</span><span class="cx"> void SocketStreamHandle::platformClose()
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p platformClose", this);
</span><del>- // We remove this handle from the active handles list first, to disable all callbacks.
- deactivateHandle(*this);
</del><ins>+ // We cancel this handle first to disable all callbacks.
+ g_cancellable_cancel(m_cancellable.get());
</ins><span class="cx"> stopWaitingForSocketWritability();
</span><span class="cx">
</span><span class="cx"> if (m_socketConnection) {
</span><span class="cx"> GUniqueOutPtr<GError> error;
</span><del>- g_io_stream_close(G_IO_STREAM(m_socketConnection.get()), 0, &error.outPtr());
</del><ins>+ g_io_stream_close(G_IO_STREAM(m_socketConnection.get()), nullptr, &error.outPtr());
</ins><span class="cx"> if (error)
</span><del>- m_client->didFailSocketStream(*this, SocketStreamError(error->code, error->message));
- m_socketConnection = 0;
</del><ins>+ didFail(SocketStreamError(error->code, error->message));
+ m_socketConnection = nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- m_outputStream = 0;
- m_inputStream = 0;
</del><ins>+ m_outputStream = nullptr;
+ m_inputStream = nullptr;
</ins><span class="cx"> m_readBuffer = nullptr;
</span><span class="cx">
</span><span class="cx"> m_client->didCloseSocketStream(*this);
</span><span class="lines">@@ -212,8 +214,10 @@
</span><span class="cx"> if (m_writeReadySource) // Already waiting.
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_writeReadySource = adoptGRef(g_pollable_output_stream_create_source(m_outputStream.get(), 0));
- g_source_set_callback(m_writeReadySource.get(), reinterpret_cast<GSourceFunc>(writeReadyCallback), m_id, 0);
</del><ins>+ m_writeReadySource = adoptGRef(g_pollable_output_stream_create_source(m_outputStream.get(), m_cancellable.get()));
+ ref();
+ g_source_set_callback(m_writeReadySource.get(), reinterpret_cast<GSourceFunc>(writeReadyCallback), this,
+ [](gpointer handle) { static_cast<SocketStreamHandle*>(handle)->deref(); });
</ins><span class="cx"> g_source_attach(m_writeReadySource.get(), g_main_context_get_thread_default());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -226,44 +230,13 @@
</span><span class="cx"> m_writeReadySource = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void connectedCallback(GSocketClient* client, GAsyncResult* result, void* id)
</del><ins>+gboolean SocketStreamHandle::writeReadyCallback(GPollableOutputStream*, SocketStreamHandle* handle)
</ins><span class="cx"> {
</span><del>- // Always finish the connection, even if this SocketStreamHandle was deactivated earlier.
- GUniqueOutPtr<GError> error;
- GSocketConnection* socketConnection = g_socket_client_connect_to_host_finish(client, result, &error.outPtr());
</del><ins>+ if (g_cancellable_is_cancelled(handle->m_cancellable.get()))
+ return G_SOURCE_REMOVE;
</ins><span class="cx">
</span><del>- // The SocketStreamHandle has been deactivated, so just close the connection, ignoring errors.
- SocketStreamHandle* handle = getHandleFromId(id);
- if (!handle) {
- if (socketConnection)
- g_io_stream_close(G_IO_STREAM(socketConnection), 0, 0);
- return;
- }
-
- handle->connected(socketConnection, error.get());
-}
-
-static void readReadyCallback(GInputStream* stream, GAsyncResult* result, void* id)
-{
- // Always finish the read, even if this SocketStreamHandle was deactivated earlier.
- GUniqueOutPtr<GError> error;
- gssize bytesRead = g_input_stream_read_finish(stream, result, &error.outPtr());
-
- SocketStreamHandle* handle = getHandleFromId(id);
- if (!handle)
- return;
-
- handle->readBytes(bytesRead, error.get());
-}
-
-static gboolean writeReadyCallback(GPollableOutputStream*, void* id)
-{
- SocketStreamHandle* handle = getHandleFromId(id);
- if (!handle)
- return FALSE;
-
</del><span class="cx"> handle->writeReady();
</span><del>- return TRUE;
</del><ins>+ return G_SOURCE_CONTINUE;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>