Attachment 55515 Details for Bug 44570 – Remove the non-interruptible version g_io_wait()

[patch] Remove the non-interruptible version g_io_wait()

Remove-the-non-interruptible-version-giowait.patch (text/plain), 9.77 KB, created by Marc-Andre Lureau on 2012-01-12 10:43:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-Andre Lureau

Created: 2012-01-12 10:43:53 UTC

Size: 9.77 KB

patch

obsolete

>From 348acdb3ad40282b9675b4706298df31d60ac11d Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
>Date: Mon, 9 Jan 2012 14:35:40 +0100
>Subject: [PATCH spice-gtk] Remove the non-interruptible version g_io_wait()
>
>Use the common g_coroutine_socket_wait()
>
>https://bugs.freedesktop.org/show_bug.cgi?id=44570
>---
> gtk/gio-coroutine.c      |   51 +++++++++++++++++++---------------------------
> gtk/gio-coroutine.h      |    9 ++++---
> gtk/spice-channel.c      |   12 +++++-----
> gtk/spice-session-priv.h |    3 +-
> gtk/spice-session.c      |   12 +++++++---
> 5 files changed, 42 insertions(+), 45 deletions(-)
>
>diff --git a/gtk/gio-coroutine.c b/gtk/gio-coroutine.c
>index 704b5ac..806dad9 100644
>--- a/gtk/gio-coroutine.c
>+++ b/gtk/gio-coroutine.c
>@@ -29,6 +29,11 @@ typedef struct _GConditionWaitSource
>     gpointer data;
> } GConditionWaitSource;
> 
>+GCoroutine* g_coroutine_self(void)
>+{
>+    return (GCoroutine*)coroutine_self();
>+}
>+
> /* Main loop helper functions */
> static gboolean g_io_wait_helper(GSocket *sock G_GNUC_UNUSED,
> 				 GIOCondition cond,
>@@ -39,52 +44,38 @@ static gboolean g_io_wait_helper(GSocket *sock G_GNUC_UNUSED,
>     return FALSE;
> }
> 
>-GIOCondition g_io_wait(GSocket *sock, GIOCondition cond)
>-{
>-    GIOCondition *ret;
>-    GSource *src = g_socket_create_source(sock,
>-                                          cond | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
>-                                          NULL);
>-    g_source_set_callback(src, (GSourceFunc)g_io_wait_helper, coroutine_self(), NULL);
>-    g_source_attach(src, NULL);
>-    ret = coroutine_yield(NULL);
>-    g_source_unref(src);
>-    return *ret;
>-}
>-
>-
>-GIOCondition g_io_wait_interruptible(GCoroutine *self,
>+GIOCondition g_coroutine_socket_wait(GCoroutine *self,
>                                      GSocket *sock,
>                                      GIOCondition cond)
> {
>-    GIOCondition *ret;
>-    gint id;
>+    GIOCondition *ret, val = 0;
>+    GSource *src;
> 
>     g_return_val_if_fail(self != NULL, 0);
>+    g_return_val_if_fail(self->wait_id == 0, 0);
>     g_return_val_if_fail(sock != NULL, 0);
> 
>-    GSource *src = g_socket_create_source(sock,
>-                                          cond | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
>-                                          NULL);
>+    src = g_socket_create_source(sock, cond | G_IO_HUP | G_IO_ERR | G_IO_NVAL, NULL);
>     g_source_set_callback(src, (GSourceFunc)g_io_wait_helper, self, NULL);
>-    id = g_source_attach(src, NULL);
>-    self->waiting = TRUE;
>+    self->wait_id = g_source_attach(src, NULL);
>     ret = coroutine_yield(NULL);
>-    self->waiting = FALSE;
>     g_source_unref(src);
> 
>-    if (ret == NULL) {
>-        g_source_remove(id);
>-        return 0;
>-    } else
>-        return *ret;
>+    if (ret != NULL)
>+        val = *ret;
>+    else
>+        g_source_remove(self->wait_id);
>+
>+    self->wait_id = 0;
>+    return val;
> }
> 
>-void g_io_wakeup(GCoroutine *coroutine)
>+void g_coroutine_wakeup(GCoroutine *coroutine)
> {
>     g_return_if_fail(coroutine != NULL);
>+    g_return_if_fail(coroutine != g_coroutine_self());
> 
>-    if (coroutine->waiting)
>+    if (coroutine->wait_id)
>         coroutine_yieldto(&coroutine->coroutine, NULL);
> }
> 
>diff --git a/gtk/gio-coroutine.h b/gtk/gio-coroutine.h
>index 43dbc55..cb96a52 100644
>--- a/gtk/gio-coroutine.h
>+++ b/gtk/gio-coroutine.h
>@@ -31,7 +31,7 @@ typedef struct _GCoroutine GCoroutine;
> struct _GCoroutine
> {
>     struct coroutine coroutine;
>-    gboolean waiting;
>+    guint wait_id;
> };
> 
> /*
>@@ -47,10 +47,11 @@ typedef gboolean (*GConditionWaitFunc)(gpointer);
> 
> typedef void (*GSignalEmitMainFunc)(GObject *object, int signum, gpointer params);
> 
>-GIOCondition g_io_wait              (GSocket *sock, GIOCondition cond);
>+GCoroutine*  g_coroutine_self       (void);
>+void         g_coroutine_wakeup     (GCoroutine *coroutine);
>+GIOCondition g_coroutine_socket_wait(GCoroutine *coroutine, GSocket *sock, GIOCondition cond);
>+
> gboolean     g_condition_wait       (GConditionWaitFunc func, gpointer data);
>-void         g_io_wakeup            (GCoroutine *coroutine);
>-GIOCondition g_io_wait_interruptible(GCoroutine *coroutine, GSocket *sock, GIOCondition cond);
> void         g_signal_emit_main_context(GObject *object, GSignalEmitMainFunc func,
>                                         int signum, gpointer params, const char *debug_info);
> void         g_object_notify_main_context(GObject *object, const gchar *property_name);
>diff --git a/gtk/spice-channel.c b/gtk/spice-channel.c
>index 5f698b9..806f37c 100644
>--- a/gtk/spice-channel.c
>+++ b/gtk/spice-channel.c
>@@ -755,7 +755,7 @@ static void spice_channel_flush_wire(SpiceChannel *channel,
>         }
>         if (ret == -1) {
>             if (cond != 0) {
>-                g_io_wait(c->sock, cond);
>+                g_coroutine_socket_wait(&c->coroutine, c->sock, cond);
>                 continue;
>             } else {
>                 SPICE_DEBUG("Closing the channel: spice_channel_flush %d", errno);
>@@ -883,7 +883,7 @@ reread:
> 
>     if (ret == -1) {
>         if (cond != 0) {
>-            g_io_wait(c->sock, cond);
>+            g_coroutine_socket_wait(&c->coroutine, c->sock, cond);
>             goto reread;
>         } else {
>             c->has_error = TRUE;
>@@ -1694,7 +1694,7 @@ void spice_channel_wakeup(SpiceChannel *channel)
> {
>     SpiceChannelPrivate *c = channel->priv;
> 
>-    g_io_wakeup(&c->coroutine);
>+    g_coroutine_wakeup(&c->coroutine);
> }
> 
> G_GNUC_INTERNAL
>@@ -2004,7 +2004,7 @@ static gboolean spice_channel_iterate(SpiceChannel *channel)
>         }
> 
>         SPICE_CHANNEL_GET_CLASS(channel)->iterate_write(channel);
>-        ret = g_io_wait_interruptible(&c->coroutine, c->sock, G_IO_IN);
>+        ret = g_coroutine_socket_wait(&c->coroutine, c->sock, G_IO_IN);
> 
> #ifdef WIN32
>         /* FIXME: windows gsocket is buggy, it doesn't return correct condition... */
>@@ -2075,7 +2075,7 @@ static void *spice_channel_coroutine(void *data)
>     }
> 
> reconnect:
>-    c->sock = spice_session_channel_open_host(c->session, c->tls);
>+    c->sock = spice_session_channel_open_host(c->session, channel, c->tls);
>     if (c->sock == NULL) {
>         if (!c->tls) {
>             SPICE_DEBUG("connection failed, trying with TLS port");
>@@ -2154,7 +2154,7 @@ ssl_reconnect:
>         if (rc <= 0) {
>             rc = SSL_get_error(c->ssl, rc);
>             if (rc == SSL_ERROR_WANT_READ || rc == SSL_ERROR_WANT_WRITE) {
>-                g_io_wait(c->sock, G_IO_OUT|G_IO_ERR|G_IO_HUP);
>+                g_coroutine_socket_wait(&c->coroutine, c->sock, G_IO_OUT|G_IO_ERR|G_IO_HUP);
>                 goto ssl_reconnect;
>             } else {
>                 g_warning("%s: SSL_connect: %s",
>diff --git a/gtk/spice-session-priv.h b/gtk/spice-session-priv.h
>index bb5ae9b..5df1182 100644
>--- a/gtk/spice-session-priv.h
>+++ b/gtk/spice-session-priv.h
>@@ -97,7 +97,8 @@ void spice_session_set_connection_id(SpiceSession *session, int id);
> int spice_session_get_connection_id(SpiceSession *session);
> gboolean spice_session_get_client_provided_socket(SpiceSession *session);
> 
>-GSocket* spice_session_channel_open_host(SpiceSession *session, gboolean use_tls);
>+GSocket* spice_session_channel_open_host(SpiceSession *session, SpiceChannel *channel,
>+                                         gboolean use_tls);
> void spice_session_channel_new(SpiceSession *session, SpiceChannel *channel);
> void spice_session_channel_destroy(SpiceSession *session, SpiceChannel *channel);
> void spice_session_channel_migrate(SpiceSession *session, SpiceChannel *channel);
>diff --git a/gtk/spice-session.c b/gtk/spice-session.c
>index 614cf02..79ba1b6 100644
>--- a/gtk/spice-session.c
>+++ b/gtk/spice-session.c
>@@ -1359,9 +1359,11 @@ gboolean spice_session_has_channel_type(SpiceSession *session, gint type)
> /* ------------------------------------------------------------------ */
> /* private functions                                                  */
> 
>-static GSocket *channel_connect_socket(GSocketAddress *sockaddr,
>+static GSocket *channel_connect_socket(SpiceChannel *channel,
>+                                       GSocketAddress *sockaddr,
>                                        GError **error)
> {
>+    SpiceChannelPrivate *c = channel->priv;
>     GSocket *sock = g_socket_new(g_socket_address_get_family(sockaddr),
>                                  G_SOCKET_TYPE_STREAM,
>                                  G_SOCKET_PROTOCOL_DEFAULT,
>@@ -1375,7 +1377,7 @@ static GSocket *channel_connect_socket(GSocketAddress *sockaddr,
>         if (*error && (*error)->code == G_IO_ERROR_PENDING) {
>             g_clear_error(error);
>             SPICE_DEBUG("Socket pending");
>-            g_io_wait(sock, G_IO_OUT | G_IO_ERR | G_IO_HUP);
>+            g_coroutine_socket_wait(&c->coroutine, sock, G_IO_OUT | G_IO_ERR | G_IO_HUP);
> 
>             if (!g_socket_check_connect_result(sock, error)) {
>                 SPICE_DEBUG("Failed to connect %s", (*error)->message);
>@@ -1394,8 +1396,10 @@ static GSocket *channel_connect_socket(GSocketAddress *sockaddr,
>     return sock;
> }
> 
>+/* coroutine context */
> G_GNUC_INTERNAL
>-GSocket* spice_session_channel_open_host(SpiceSession *session, gboolean use_tls)
>+GSocket* spice_session_channel_open_host(SpiceSession *session, SpiceChannel *channel,
>+                                         gboolean use_tls)
> {
>     SpiceSessionPrivate *s = SPICE_SESSION_GET_PRIVATE(session);
>     GSocketConnectable *addr;
>@@ -1425,7 +1429,7 @@ GSocket* spice_session_channel_open_host(SpiceSession *session, gboolean use_tls
>            (sockaddr = g_socket_address_enumerator_next(enumerator, NULL, &conn_error))) {
>         SPICE_DEBUG("Trying one socket");
>         g_clear_error(&conn_error);
>-        sock = channel_connect_socket(sockaddr, &conn_error);
>+        sock = channel_connect_socket(channel, sockaddr, &conn_error);
>         if (conn_error != NULL)
>             SPICE_DEBUG("%s", conn_error->message);
>         g_object_unref(sockaddr);
>-- 
>1.7.7.5

Actions: View | Splinter Review

Attachments on bug 44570: 55343 | 55344 | 55345 | 55346 | 55347 | 55348 | 55512 | 55513 | 55514 | 55515 | 55516 | 55517 | 55518

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.