From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:50307) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCRYu-00058k-W8 for qemu-devel@nongnu.org; Fri, 14 Sep 2012 04:47:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TCRYp-0000wW-76 for qemu-devel@nongnu.org; Fri, 14 Sep 2012 04:47:44 -0400 Received: from mail-we0-f173.google.com ([74.125.82.173]:47609) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TCRYo-0000sO-TB for qemu-devel@nongnu.org; Fri, 14 Sep 2012 04:47:39 -0400 Received: by mail-we0-f173.google.com with SMTP id z53so2182085wey.4 for ; Fri, 14 Sep 2012 01:47:38 -0700 (PDT) From: Stefan Hajnoczi Date: Fri, 14 Sep 2012 09:46:59 +0100 Message-Id: <1347612420-5704-13-git-send-email-stefanha@gmail.com> In-Reply-To: <1347612420-5704-1-git-send-email-stefanha@gmail.com> References: <1347612420-5704-1-git-send-email-stefanha@gmail.com> Subject: [Qemu-devel] [PATCH 12/13] net: EAGAIN handling for net/socket.c UDP List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu-devel@nongnu.org, Stefan Hajnoczi From: Stefan Hajnoczi Implement asynchronous send for UDP (or other SOCK_DGRAM) sockets. If send fails with EAGAIN we wait for the socket to become writable again. Signed-off-by: Stefan Hajnoczi --- net/socket.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net/socket.c b/net/socket.c index 7bff536..aabf0a4 100644 --- a/net/socket.c +++ b/net/socket.c @@ -102,9 +102,19 @@ static ssize_t net_socket_receive(NetClientState *nc, const uint8_t *buf, size_t static ssize_t net_socket_receive_dgram(NetClientState *nc, const uint8_t *buf, size_t size) { NetSocketState *s = DO_UPCAST(NetSocketState, nc, nc); + ssize_t ret; - return sendto(s->fd, (const void *)buf, size, 0, - (struct sockaddr *)&s->dgram_dst, sizeof(s->dgram_dst)); + do { + ret = sendto(s->fd, buf, size, 0, + (struct sockaddr *)&s->dgram_dst, + sizeof(s->dgram_dst)); + } while (ret == -1 && errno == EINTR); + + if (ret == -1 && errno == EAGAIN) { + net_socket_write_poll(s, true); + return 0; + } + return ret; } static void net_socket_send(void *opaque) -- 1.7.10.4