From patchwork Tue May 4 18:23:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 51662 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id BC6F7B7D49 for ; Wed, 5 May 2010 17:38:39 +1000 (EST) Received: from localhost ([127.0.0.1]:41738 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9ZBj-0006UX-7H for incoming@patchwork.ozlabs.org; Wed, 05 May 2010 03:38:35 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O9Mp1-0002tU-8z for qemu-devel@nongnu.org; Tue, 04 May 2010 14:26:19 -0400 Received: from [140.186.70.92] (port=57480 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O9Moz-0002rN-F4 for qemu-devel@nongnu.org; Tue, 04 May 2010 14:26:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O9Mox-0001v0-WF for qemu-devel@nongnu.org; Tue, 04 May 2010 14:26:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:21825) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O9Mox-0001ut-NO for qemu-devel@nongnu.org; Tue, 04 May 2010 14:26:15 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o44IQ8DA023297 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 4 May 2010 14:26:08 -0400 Received: from localhost (vpn-240-153.phx2.redhat.com [10.3.240.153]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o44IQ20q022048; Tue, 4 May 2010 14:26:06 -0400 From: Amit Shah To: qemu list Date: Tue, 4 May 2010 23:53:58 +0530 Message-Id: <1272997439-9675-6-git-send-email-amit.shah@redhat.com> In-Reply-To: <1272997439-9675-5-git-send-email-amit.shah@redhat.com> References: <1272997439-9675-1-git-send-email-amit.shah@redhat.com> <1272997439-9675-2-git-send-email-amit.shah@redhat.com> <1272997439-9675-3-git-send-email-amit.shah@redhat.com> <1272997439-9675-4-git-send-email-amit.shah@redhat.com> <1272997439-9675-5-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , Paul Brook , Gerd Hoffmann , Juan Quintela Subject: [Qemu-devel] [PATCH v6 5/6] char: unix/tcp: Add a non-blocking write handler X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/qemu-char.c b/qemu-char.c index e6934f6..da70b9b 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -2129,11 +2129,60 @@ 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; + IOHandler *write_cb; + int flags; + bool nonblock; + + flags = fcntl(s->fd, F_GETFL); + if (flags == -1) { + flags = 0; + } + nonblock = flags & O_NONBLOCK; + + write_cb = NULL; + chr->nonblock = false; + if (nonblock && chr->chr_write_unblocked) { + write_cb = 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 +2315,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;