From ac4326884b181a4da9491f371be61f181e0a9115 Mon Sep 17 00:00:00 2001 From: Benjamin Franzke Date: Sat, 15 Jan 2011 00:40:00 +0100 Subject: [PATCH] connection: Write before reading connection data --- wayland/connection.c | 60 ++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/wayland/connection.c b/wayland/connection.c index dadf2c39..e8e8357c 100644 --- a/wayland/connection.c +++ b/wayland/connection.c @@ -251,36 +251,6 @@ wl_connection_data(struct wl_connection *connection, uint32_t mask) char cmsg[128]; int len, count, clen; - if (mask & WL_CONNECTION_READABLE) { - wl_buffer_put_iov(&connection->in, iov, &count); - - msg.msg_name = NULL; - msg.msg_namelen = 0; - msg.msg_iov = iov; - msg.msg_iovlen = count; - msg.msg_control = cmsg; - msg.msg_controllen = sizeof cmsg; - msg.msg_flags = 0; - - do { - len = recvmsg(connection->fd, &msg, 0); - } while (len < 0 && errno == EINTR); - - if (len < 0) { - fprintf(stderr, - "read error from connection %p: %m (%d)\n", - connection, errno); - return -1; - } else if (len == 0) { - /* FIXME: Handle this better? */ - return -1; - } - - decode_cmsg(&connection->fds_in, &msg); - - connection->in.head += len; - } - if (mask & WL_CONNECTION_WRITABLE) { wl_buffer_get_iov(&connection->out, iov, &count); @@ -314,6 +284,36 @@ wl_connection_data(struct wl_connection *connection, uint32_t mask) connection->data); } + if (mask & WL_CONNECTION_READABLE) { + wl_buffer_put_iov(&connection->in, iov, &count); + + msg.msg_name = NULL; + msg.msg_namelen = 0; + msg.msg_iov = iov; + msg.msg_iovlen = count; + msg.msg_control = cmsg; + msg.msg_controllen = sizeof cmsg; + msg.msg_flags = 0; + + do { + len = recvmsg(connection->fd, &msg, 0); + } while (len < 0 && errno == EINTR); + + if (len < 0) { + fprintf(stderr, + "read error from connection %p: %m (%d)\n", + connection, errno); + return -1; + } else if (len == 0) { + /* FIXME: Handle this better? */ + return -1; + } + + decode_cmsg(&connection->fds_in, &msg); + + connection->in.head += len; + } + return connection->in.head - connection->in.tail; }