diff options
| author | MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp> | 2012-06-27 07:26:20 +0900 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-07-09 15:53:01 +0200 |
| commit | b97564f4c5457b218c7dd56dde0554ce4765cae9 (patch) | |
| tree | 8e8dacf2b97d6f588032e2f0b82cba94b7a569c4 | |
| parent | 2dfcca3b6828052cadd30c66a1a840bf0fc6670c (diff) | |
sheepdog: use coroutine based socket functions in coroutine context
This removes blocking network I/Os in coroutine context.
Signed-off-by: MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/sheepdog.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/block/sheepdog.c b/block/sheepdog.c index 0b49c6d660..5dc1d7a348 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; |