[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 5/6] char: unix/tcp: Add a non-blocking write han
From: |
Amit Shah |
Subject: |
[Qemu-devel] [PATCH v7 5/6] char: unix/tcp: Add a non-blocking write handler |
Date: |
Wed, 5 May 2010 03:09:29 +0530 |
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 <address@hidden>
---
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
- [Qemu-devel] [PATCH v7 0/6], Amit Shah, 2010/05/04
- [Qemu-devel] [PATCH v7 1/6] virtio-console: Factor out common init between console and generic ports, Amit Shah, 2010/05/04
- [Qemu-devel] [PATCH v7 2/6] char: Add a QemuChrHandlers struct to initialise chardev handlers, Amit Shah, 2010/05/04
- [Qemu-devel] Re: [PATCH v7 4/6] char: Add qemu_chr_write_nb() for nonblocking writes, Anthony Liguori, 2010/05/05
- [Qemu-devel] Re: [PATCH v7 4/6] char: Add qemu_chr_write_nb() for nonblocking writes, Amit Shah, 2010/05/05
- [Qemu-devel] Re: [PATCH v7 4/6] char: Add qemu_chr_write_nb() for nonblocking writes, Paul Brook, 2010/05/05
- [Qemu-devel] Re: [PATCH v7 4/6] char: Add qemu_chr_write_nb() for nonblocking writes, Anthony Liguori, 2010/05/05
- [Qemu-devel] Re: [PATCH v7 4/6] char: Add qemu_chr_write_nb() for nonblocking writes, Paul Brook, 2010/05/05
- [Qemu-devel] Re: [PATCH v7 4/6] char: Add qemu_chr_write_nb() for nonblocking writes, Gerd Hoffmann, 2010/05/05
- [Qemu-devel] Re: [PATCH v7 4/6] char: Add qemu_chr_write_nb() for nonblocking writes, Anthony Liguori, 2010/05/05
- [Qemu-devel] Re: [PATCH v7 4/6] char: Add qemu_chr_write_nb() for nonblocking writes, Gerd Hoffmann, 2010/05/05
- [Qemu-devel] Re: [PATCH v7 4/6] char: Add qemu_chr_write_nb() for nonblocking writes, Anthony Liguori, 2010/05/05