From 2dfcca3b6828052cadd30c66a1a840bf0fc6670c Mon Sep 17 00:00:00 2001 From: MORITA Kazutaka Date: Wed, 27 Jun 2012 07:26:19 +0900 Subject: [PATCH] sheepdog: restart I/O when socket becomes ready in do_co_req() Currently, no one reenters the yielded coroutine. This fixes it. Signed-off-by: MORITA Kazutaka Signed-off-by: Kevin Wolf --- block/sheepdog.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) 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; } -- 2.7.4