[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/6] sheepdog: use coroutine based socket functions
From: |
MORITA Kazutaka |
Subject: |
[Qemu-devel] [PATCH 3/6] sheepdog: use coroutine based socket functions in coroutine context |
Date: |
Wed, 27 Jun 2012 07:26:20 +0900 |
This removes blocking network I/Os in coroutine context.
Signed-off-by: MORITA Kazutaka <address@hidden>
---
block/sheepdog.c | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/block/sheepdog.c b/block/sheepdog.c
index 0b49c6d..5dc1d7a 100644
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -541,11 +541,18 @@ static coroutine_fn int send_co_req(int sockfd,
SheepdogReq *hdr, void *data,
return ret;
}
+static coroutine_fn int do_co_req(int sockfd, SheepdogReq *hdr, void *data,
+ unsigned int *wlen, unsigned int *rlen);
+
static int do_req(int sockfd, SheepdogReq *hdr, void *data,
unsigned int *wlen, unsigned int *rlen)
{
int ret;
+ if (qemu_in_coroutine()) {
+ return do_co_req(sockfd, hdr, data, wlen, rlen);
+ }
+
socket_set_block(sockfd);
ret = send_req(sockfd, hdr, data, wlen);
if (ret < 0) {
@@ -1642,7 +1649,6 @@ static coroutine_fn int sd_co_writev(BlockDriverState
*bs, int64_t sector_num,
int ret;
if (bs->growable && sector_num + nb_sectors > bs->total_sectors) {
- /* TODO: shouldn't block here */
ret = sd_truncate(bs, (sector_num + nb_sectors) * SECTOR_SIZE);
if (ret < 0) {
return ret;
@@ -1710,7 +1716,7 @@ static int coroutine_fn
sd_co_flush_to_disk(BlockDriverState *bs)
hdr.opcode = SD_OP_FLUSH_VDI;
hdr.oid = vid_to_vdi_oid(inode->vdi_id);
- ret = do_co_req(s->flush_fd, (SheepdogReq *)&hdr, NULL, &wlen, &rlen);
+ ret = do_req(s->flush_fd, (SheepdogReq *)&hdr, NULL, &wlen, &rlen);
if (ret) {
error_report("failed to send a request to the sheep");
return ret;
--
1.7.2.5
- [Qemu-devel] [PATCH 0/6] sheepdog: various fixes, MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 1/6] sheepdog: fix dprintf format strings, MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 5/6] sheepdog: split outstanding list into inflight and pending, MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 4/6] sheepdog: make sure we don't free aiocb before sending all requests, MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 2/6] sheepdog: restart I/O when socket becomes ready in do_co_req(), MORITA Kazutaka, 2012/06/26
- [Qemu-devel] [PATCH 3/6] sheepdog: use coroutine based socket functions in coroutine context,
MORITA Kazutaka <=
- [Qemu-devel] [PATCH 6/6] sheepdog: traverse pending_list from the first for each time, MORITA Kazutaka, 2012/06/26