[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 05/25] sheepdog: restart I/O when socket becomes rea
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 05/25] sheepdog: restart I/O when socket becomes ready in do_co_req() |
Date: |
Mon, 9 Jul 2012 16:16:08 +0200 |
From: MORITA Kazutaka <address@hidden>
Currently, no one reenters the yielded coroutine. This fixes it.
Signed-off-by: MORITA Kazutaka <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block/sheepdog.c | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index afd06aa..0b49c6d 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -577,10 +577,21 @@ out:
return ret;
}
+static void restart_co_req(void *opaque)
+{
+ Coroutine *co = opaque;
+
+ qemu_coroutine_enter(co, NULL);
+}
+
static coroutine_fn int do_co_req(int sockfd, SheepdogReq *hdr, void *data,
unsigned int *wlen, unsigned int *rlen)
{
int ret;
+ Coroutine *co;
+
+ co = qemu_coroutine_self();
+ qemu_aio_set_fd_handler(sockfd, NULL, restart_co_req, NULL, co);
socket_set_block(sockfd);
ret = send_co_req(sockfd, hdr, data, wlen);
@@ -588,6 +599,8 @@ static coroutine_fn int do_co_req(int sockfd, SheepdogReq
*hdr, void *data,
goto out;
}
+ qemu_aio_set_fd_handler(sockfd, restart_co_req, NULL, NULL, co);
+
ret = qemu_co_recv(sockfd, hdr, sizeof(*hdr));
if (ret < sizeof(*hdr)) {
error_report("failed to get a rsp, %s", strerror(errno));
@@ -609,6 +622,7 @@ static coroutine_fn int do_co_req(int sockfd, SheepdogReq
*hdr, void *data,
}
ret = 0;
out:
+ qemu_aio_set_fd_handler(sockfd, NULL, NULL, NULL, NULL);
socket_set_nonblock(sockfd);
return ret;
}
--
1.7.6.5
- [Qemu-devel] [PULL 00/25] Block patches, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 04/25] sheepdog: fix dprintf format strings, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 05/25] sheepdog: restart I/O when socket becomes ready in do_co_req(),
Kevin Wolf <=
- [Qemu-devel] [PATCH 03/25] blockdev: warn when copy_on_read=on and readonly=on, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 01/25] qcow2: fix #ifdef'd qcow2_check_refcounts() callers, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 07/25] sheepdog: make sure we don't free aiocb before sending all requests, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 12/25] blkdebug: pass getlength to underlying file, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 02/25] qcow2: preserve free_byte_offset when qcow2_alloc_bytes() fails, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 06/25] sheepdog: use coroutine based socket functions in coroutine context, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 08/25] sheepdog: split outstanding list into inflight and pending, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 09/25] sheepdog: traverse pending_list from the first for each time, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 14/25] blkdebug: optionally tie errors to a specific sector, Kevin Wolf, 2012/07/09
- [Qemu-devel] [PATCH 10/25] blkdebug: remove sync i/o events, Kevin Wolf, 2012/07/09