motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-16 14:41:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

curl: convert readv to coroutines

Browse source 
This is pretty simple.  The bottom half goes away because, unlike
bdrv_aio_readv, coroutine-based read can return immediately without
yielding.  However, for simplicity I kept the former bottom half
handler in a separate function.

Reviewed-by: Jeff Cody <jcody@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-id: 20170515100059.15795-7-pbonzini@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Paolo Bonzini 2017-05-15 12:00:58 +02:00 • committed by Jeff Cody
parent 2125e5ea6e
commit 28256d8246
1 changed files with 39 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

96
block/curl.c
View file

@ -76,10 +76,6 @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,
#define CURL_TIMEOUT_DEFAULT 5 #define CURL_TIMEOUT_DEFAULT 5
#define CURL_TIMEOUT_MAX 10000 #define CURL_TIMEOUT_MAX 10000
#define FIND_RET_NONE 0
#define FIND_RET_OK 1
#define FIND_RET_WAIT 2
#define CURL_BLOCK_OPT_URL "url" #define CURL_BLOCK_OPT_URL "url"
#define CURL_BLOCK_OPT_READAHEAD "readahead" #define CURL_BLOCK_OPT_READAHEAD "readahead"
#define CURL_BLOCK_OPT_SSLVERIFY "sslverify" #define CURL_BLOCK_OPT_SSLVERIFY "sslverify"
@ -94,11 +90,12 @@ static CURLMcode __curl_multi_socket_action(CURLM *multi_handle,
struct BDRVCURLState; struct BDRVCURLState;
typedef struct CURLAIOCB { typedef struct CURLAIOCB {
BlockAIOCB common; Coroutine *co;
QEMUIOVector *qiov; QEMUIOVector *qiov;
uint64_t offset; uint64_t offset;
uint64_t bytes; uint64_t bytes;
int ret;
size_t start; size_t start;
size_t end; size_t end;
@ -269,11 +266,11 @@ static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)
request_length - offset); request_length - offset);
} }
qemu_mutex_unlock(&s->s->mutex); acb->ret = 0;
acb->common.cb(acb->common.opaque, 0);
qemu_mutex_lock(&s->s->mutex);
qemu_aio_unref(acb);
s->acb[i] = NULL; s->acb[i] = NULL;
qemu_mutex_unlock(&s->s->mutex);
aio_co_wake(acb->co);
qemu_mutex_lock(&s->s->mutex);
} }
} }
@ -283,8 +280,8 @@ read_end:
} }
/* Called with s->mutex held. */ /* Called with s->mutex held. */
static int curl_find_buf(BDRVCURLState *s, uint64_t start, uint64_t len, static bool curl_find_buf(BDRVCURLState *s, uint64_t start, uint64_t len,
CURLAIOCB *acb) CURLAIOCB *acb)
{ {
int i; int i;
uint64_t end = start + len; uint64_t end = start + len;
@ -313,7 +310,8 @@ static int curl_find_buf(BDRVCURLState *s, uint64_t start, uint64_t len,
if (clamped_len < len) { if (clamped_len < len) {
qemu_iovec_memset(acb->qiov, clamped_len, 0, len - clamped_len); qemu_iovec_memset(acb->qiov, clamped_len, 0, len - clamped_len);
} }
return FIND_RET_OK; acb->ret = 0;
return true;
} }
// Wait for unfinished chunks // Wait for unfinished chunks
@ -331,13 +329,13 @@ static int curl_find_buf(BDRVCURLState *s, uint64_t start, uint64_t len,
for (j=0; j<CURL_NUM_ACB; j++) { for (j=0; j<CURL_NUM_ACB; j++) {
if (!state->acb[j]) { if (!state->acb[j]) {
state->acb[j] = acb; state->acb[j] = acb;
return FIND_RET_WAIT; return true;
} }
} }
} }
} }
return FIND_RET_NONE; return false;
} }
/* Called with s->mutex held. */ /* Called with s->mutex held. */
@ -382,11 +380,11 @@ static void curl_multi_check_completion(BDRVCURLState *s)
continue; continue;
} }
qemu_mutex_unlock(&s->mutex); acb->ret = -EIO;
acb->common.cb(acb->common.opaque, -EIO);
qemu_mutex_lock(&s->mutex);
qemu_aio_unref(acb);
state->acb[i] = NULL; state->acb[i] = NULL;
qemu_mutex_unlock(&s->mutex);
aio_co_wake(acb->co);
qemu_mutex_lock(&s->mutex);
} }
} }
@ -844,19 +842,11 @@ out_noclean:
return -EINVAL; return -EINVAL;
} }
static const AIOCBInfo curl_aiocb_info = { static void curl_setup_preadv(BlockDriverState *bs, CURLAIOCB *acb)
.aiocb_size = sizeof(CURLAIOCB),
};
static void curl_readv_bh_cb(void *p)
{ {
CURLState *state; CURLState *state;
int running; int running;
int ret = -EINPROGRESS;
CURLAIOCB *acb = p;
BlockDriverState *bs = acb->common.bs;
BDRVCURLState *s = bs->opaque; BDRVCURLState *s = bs->opaque;
uint64_t start = acb->offset; uint64_t start = acb->offset;
@ -866,14 +856,8 @@ static void curl_readv_bh_cb(void *p)
// In case we have the requested data already (e.g. read-ahead), // In case we have the requested data already (e.g. read-ahead),
// we can just call the callback and be done. // we can just call the callback and be done.
switch (curl_find_buf(s, start, acb->bytes, acb)) { if (curl_find_buf(s, start, acb->bytes, acb)) {
case FIND_RET_OK: goto out;
ret = 0;
goto out;
case FIND_RET_WAIT:
goto out;
default:
break;
} }
// No cache found, so let's start a new request // No cache found, so let's start a new request
@ -889,7 +873,7 @@ static void curl_readv_bh_cb(void *p)
if (curl_init_state(s, state) < 0) { if (curl_init_state(s, state) < 0) {
curl_clean_state(state); curl_clean_state(state);
ret = -EIO; acb->ret = -EIO;
goto out; goto out;
} }
@ -904,7 +888,7 @@ static void curl_readv_bh_cb(void *p)
state->orig_buf = g_try_malloc(state->buf_len); state->orig_buf = g_try_malloc(state->buf_len);
if (state->buf_len && state->orig_buf == NULL) { if (state->buf_len && state->orig_buf == NULL) {
curl_clean_state(state); curl_clean_state(state);
ret = -ENOMEM; acb->ret = -ENOMEM;
goto out; goto out;
} }
state->acb[0] = acb; state->acb[0] = acb;
@ -921,26 +905,24 @@ static void curl_readv_bh_cb(void *p)
out: out:
qemu_mutex_unlock(&s->mutex); qemu_mutex_unlock(&s->mutex);
if (ret != -EINPROGRESS) {
acb->common.cb(acb->common.opaque, ret);
qemu_aio_unref(acb);
}
} }
static BlockAIOCB *curl_aio_readv(BlockDriverState *bs, static int coroutine_fn curl_co_preadv(BlockDriverState *bs,
int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags)
BlockCompletionFunc *cb, void *opaque)
{ {
CURLAIOCB *acb; CURLAIOCB acb = {
.co = qemu_coroutine_self(),
.ret = -EINPROGRESS,
.qiov = qiov,
.offset = offset,
.bytes = bytes
};
acb = qemu_aio_get(&curl_aiocb_info, bs, cb, opaque); curl_setup_preadv(bs, &acb);
while (acb.ret == -EINPROGRESS) {
acb->qiov = qiov; qemu_coroutine_yield();
acb->offset = sector_num * BDRV_SECTOR_SIZE; }
acb->bytes = nb_sectors * BDRV_SECTOR_SIZE; return acb.ret;
aio_bh_schedule_oneshot(bdrv_get_aio_context(bs), curl_readv_bh_cb, acb);
return &acb->common;
} }
static void curl_close(BlockDriverState *bs) static void curl_close(BlockDriverState *bs)
@ -971,7 +953,7 @@ static BlockDriver bdrv_http = {
.bdrv_close = curl_close, .bdrv_close = curl_close,
.bdrv_getlength = curl_getlength, .bdrv_getlength = curl_getlength,
.bdrv_aio_readv = curl_aio_readv, .bdrv_co_preadv = curl_co_preadv,
.bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_detach_aio_context = curl_detach_aio_context,
.bdrv_attach_aio_context = curl_attach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context,
@ -987,7 +969,7 @@ static BlockDriver bdrv_https = {
.bdrv_close = curl_close, .bdrv_close = curl_close,
.bdrv_getlength = curl_getlength, .bdrv_getlength = curl_getlength,
.bdrv_aio_readv = curl_aio_readv, .bdrv_co_preadv = curl_co_preadv,
.bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_detach_aio_context = curl_detach_aio_context,
.bdrv_attach_aio_context = curl_attach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context,
@ -1003,7 +985,7 @@ static BlockDriver bdrv_ftp = {
.bdrv_close = curl_close, .bdrv_close = curl_close,
.bdrv_getlength = curl_getlength, .bdrv_getlength = curl_getlength,
.bdrv_aio_readv = curl_aio_readv, .bdrv_co_preadv = curl_co_preadv,
.bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_detach_aio_context = curl_detach_aio_context,
.bdrv_attach_aio_context = curl_attach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context,
@ -1019,7 +1001,7 @@ static BlockDriver bdrv_ftps = {
.bdrv_close = curl_close, .bdrv_close = curl_close,
.bdrv_getlength = curl_getlength, .bdrv_getlength = curl_getlength,
.bdrv_aio_readv = curl_aio_readv, .bdrv_co_preadv = curl_co_preadv,
.bdrv_detach_aio_context = curl_detach_aio_context, .bdrv_detach_aio_context = curl_detach_aio_context,
.bdrv_attach_aio_context = curl_attach_aio_context, .bdrv_attach_aio_context = curl_attach_aio_context,