From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9Ps9-0006WW-EK for qemu-devel@nongnu.org; Tue, 04 May 2010 17:41:45 -0400 Received: from [140.186.70.92] (port=45105 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9Ps7-0006UF-TU for qemu-devel@nongnu.org; Tue, 04 May 2010 17:41:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9Ps6-00078Q-5b for qemu-devel@nongnu.org; Tue, 04 May 2010 17:41:43 -0400 Received: from mx1.redhat.com ([209.132.183.28]:12137) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9Ps5-00078G-US for qemu-devel@nongnu.org; Tue, 04 May 2010 17:41:42 -0400 From: Amit Shah Date: Wed, 5 May 2010 03:09:29 +0530 Message-Id: <1273009170-17530-6-git-send-email-amit.shah@redhat.com> In-Reply-To: <1273009170-17530-5-git-send-email-amit.shah@redhat.com> References: <1273009170-17530-1-git-send-email-amit.shah@redhat.com> <1273009170-17530-2-git-send-email-amit.shah@redhat.com> <1273009170-17530-3-git-send-email-amit.shah@redhat.com> <1273009170-17530-4-git-send-email-amit.shah@redhat.com> <1273009170-17530-5-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH v7 5/6] char: unix/tcp: Add a non-blocking write handler List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Amit Shah , Paul Brook , Gerd Hoffmann , Juan Quintela Add a non-blocking write handler that can return with -EAGAIN to the caller and also callback when the socket becomes writable. Non-blocking writes are only enabled for sockets that are opened in non-blocking mode and only for callers that have registered a callback handler for resuming writes. Signed-off-by: Amit Shah --- qemu-char.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index 5e4dec3..9aa3401 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2129,11 +2129,57 @@ static void tcp_chr_read(void *opaque) } } +static void tcp_chr_write_unblocked(void *opaque) +{ + CharDriverState *chr = opaque; + TCPCharDriver *s = chr->opaque; + + assert(chr->write_blocked && chr->chr_write_unblocked); + + chr->write_blocked = false; + qemu_set_fd_handler2(s->fd, tcp_chr_read_poll, tcp_chr_read, NULL, chr); + chr->chr_write_unblocked(chr->handler_opaque); +} + +static ssize_t tcp_chr_write_nb(CharDriverState *chr, const uint8_t *buf, + size_t len) +{ + TCPCharDriver *s = chr->opaque; + ssize_t ret; + + if (!s->connected) { + /* XXX: indicate an error? */ + return len; + } + + ret = send_all(s->fd, buf, len, true); + if (ret == -EAGAIN) { + chr->write_blocked = true; + qemu_set_fd_handler2(s->fd, tcp_chr_read_poll, + tcp_chr_read, tcp_chr_write_unblocked, chr); + } + return ret; +} + static void tcp_chr_connect(void *opaque) { CharDriverState *chr = opaque; TCPCharDriver *s = chr->opaque; + int flags; + bool nonblock; + + flags = fcntl(s->fd, F_GETFL); + if (flags == -1) { + flags = 0; + } + nonblock = flags & O_NONBLOCK; + + chr->nonblock = false; + if (nonblock && chr->chr_write_unblocked) { + chr->nonblock = true; + } + chr->write_blocked = false; s->connected = 1; qemu_set_fd_handler2(s->fd, tcp_chr_read_poll, tcp_chr_read, NULL, chr); @@ -2266,6 +2312,7 @@ static CharDriverState *qemu_chr_open_socket(QemuOpts *opts) chr->opaque = s; chr->chr_write = tcp_chr_write; + chr->chr_write_nb = tcp_chr_write_nb; chr->chr_close = tcp_chr_close; chr->get_msgfd = tcp_get_msgfd; -- 1.6.2.5