[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3] yield_until_fd_readable: make it work with any AioContect
From: |
Dietmar Maurer |
Subject: |
[PATCH v3] yield_until_fd_readable: make it work with any AioContect |
Date: |
Mon, 21 Oct 2019 10:50:55 +0200 |
Simply use qemu_get_current_aio_context().
Signed-off-by: Dietmar Maurer <address@hidden>
---
Changelog for v3:
- use (IOHandler *) instead of ((void (*)(void *))
- coding style: fix max line length
Changelog for v2:
- use correct read handler in aio_set_fd_handler (instead of write handler)
util/qemu-coroutine-io.c | 21 ++++-----------------
1 file changed, 4 insertions(+), 17 deletions(-)
diff --git a/util/qemu-coroutine-io.c b/util/qemu-coroutine-io.c
index 44a8969a69..dbbe817464 100644
--- a/util/qemu-coroutine-io.c
+++ b/util/qemu-coroutine-io.c
@@ -66,25 +66,12 @@ qemu_co_send_recv(int sockfd, void *buf, size_t bytes, bool
do_send)
return qemu_co_sendv_recvv(sockfd, &iov, 1, 0, bytes, do_send);
}
-typedef struct {
- Coroutine *co;
- int fd;
-} FDYieldUntilData;
-
-static void fd_coroutine_enter(void *opaque)
-{
- FDYieldUntilData *data = opaque;
- qemu_set_fd_handler(data->fd, NULL, NULL, NULL);
- qemu_coroutine_enter(data->co);
-}
-
void coroutine_fn yield_until_fd_readable(int fd)
{
- FDYieldUntilData data;
-
assert(qemu_in_coroutine());
- data.co = qemu_coroutine_self();
- data.fd = fd;
- qemu_set_fd_handler(fd, fd_coroutine_enter, NULL, &data);
+ AioContext *ctx = qemu_get_current_aio_context();
+ aio_set_fd_handler(ctx, fd, false, (IOHandler *)qemu_coroutine_enter,
+ NULL, NULL, qemu_coroutine_self());
qemu_coroutine_yield();
+ aio_set_fd_handler(ctx, fd, false, NULL, NULL, NULL, NULL);
}
--
2.20.1
- [PATCH v3] yield_until_fd_readable: make it work with any AioContect,
Dietmar Maurer <=