[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 4/7] curl: split curl_find_state/curl_init_state
From: |
Paolo Bonzini |
Subject: |
[Qemu-block] [PATCH v3 4/7] curl: split curl_find_state/curl_init_state |
Date: |
Mon, 15 May 2017 12:00:56 +0200 |
If curl_easy_init fails, a CURLState is left with s->in_use = 1. Split
curl_init_state in two, so that we can distinguish the two failures and
call curl_clean_state if needed.
While at it, simplify curl_find_state, removing a dummy loop. The
aio_poll loop is moved to the sole caller that needs it.
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/curl.c | 52 ++++++++++++++++++++++++++++++----------------------
1 file changed, 30 insertions(+), 22 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index 5e6ddf3a34..29132ab835 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -455,34 +455,27 @@ static void curl_multi_timeout_do(void *arg)
}
/* Called with s->mutex held. */
-static CURLState *curl_init_state(BlockDriverState *bs, BDRVCURLState *s)
+static CURLState *curl_find_state(BDRVCURLState *s)
{
CURLState *state = NULL;
- int i, j;
-
- do {
- for (i=0; i<CURL_NUM_STATES; i++) {
- for (j=0; j<CURL_NUM_ACB; j++)
- if (s->states[i].acb[j])
- continue;
- if (s->states[i].in_use)
- continue;
+ int i;
+ for (i=0; i < CURL_NUM_STATES; i++) {
+ if (!s->states[i].in_use) {
state = &s->states[i];
state->in_use = 1;
break;
}
- if (!state) {
- qemu_mutex_unlock(&s->mutex);
- aio_poll(bdrv_get_aio_context(bs), true);
- qemu_mutex_lock(&s->mutex);
- }
- } while(!state);
+ }
+ return state;
+}
+static int curl_init_state(BDRVCURLState *s, CURLState *state)
+{
if (!state->curl) {
state->curl = curl_easy_init();
if (!state->curl) {
- return NULL;
+ return -EIO;
}
curl_easy_setopt(state->curl, CURLOPT_URL, s->url);
curl_easy_setopt(state->curl, CURLOPT_SSL_VERIFYPEER,
@@ -535,7 +528,7 @@ static CURLState *curl_init_state(BlockDriverState *bs,
BDRVCURLState *s)
QLIST_INIT(&state->sockets);
state->s = s;
- return state;
+ return 0;
}
/* Called with s->mutex held. */
@@ -756,13 +749,18 @@ static int curl_open(BlockDriverState *bs, QDict
*options, int flags,
s->aio_context = bdrv_get_aio_context(bs);
s->url = g_strdup(file);
qemu_mutex_lock(&s->mutex);
- state = curl_init_state(bs, s);
+ state = curl_find_state(s);
qemu_mutex_unlock(&s->mutex);
- if (!state)
+ if (!state) {
goto out_noclean;
+ }
// Get file size
+ if (curl_init_state(s, state) < 0) {
+ goto out;
+ }
+
s->accept_range = false;
curl_easy_setopt(state->curl, CURLOPT_NOBODY, 1);
curl_easy_setopt(state->curl, CURLOPT_HEADERFUNCTION,
@@ -857,8 +855,18 @@ static void curl_readv_bh_cb(void *p)
}
// No cache found, so let's start a new request
- state = curl_init_state(acb->common.bs, s);
- if (!state) {
+ for (;;) {
+ state = curl_find_state(s);
+ if (state) {
+ break;
+ }
+ qemu_mutex_unlock(&s->mutex);
+ aio_poll(bdrv_get_aio_context(bs), true);
+ qemu_mutex_lock(&s->mutex);
+ }
+
+ if (curl_init_state(s, state) < 0) {
+ curl_clean_state(state);
ret = -EIO;
goto out;
}
--
2.12.2
- [Qemu-block] [PATCH v3 0/7] curl: locking cleanups/fixes, coroutine conversion, remove aio_poll, Paolo Bonzini, 2017/05/15
- [Qemu-block] [PATCH v3 1/7] curl: strengthen assertion in curl_clean_state, Paolo Bonzini, 2017/05/15
- [Qemu-block] [PATCH v3 4/7] curl: split curl_find_state/curl_init_state,
Paolo Bonzini <=
- [Qemu-block] [PATCH v3 3/7] curl: avoid recursive locking of BDRVCURLState mutex, Paolo Bonzini, 2017/05/15
- [Qemu-block] [PATCH v3 5/7] curl: convert CURLAIOCB to byte values, Paolo Bonzini, 2017/05/15
- [Qemu-block] [PATCH v3 2/7] curl: never invoke callbacks with s->mutex held, Paolo Bonzini, 2017/05/15
- [Qemu-block] [PATCH v3 7/7] curl: do not do aio_poll when waiting for a free CURLState, Paolo Bonzini, 2017/05/15
- [Qemu-block] [PATCH v3 6/7] curl: convert readv to coroutines, Paolo Bonzini, 2017/05/15
- Re: [Qemu-block] [Qemu-devel] [PATCH v3 0/7] curl: locking cleanups/fixes, coroutine conversion, remove aio_poll, no-reply, 2017/05/15
- Re: [Qemu-block] [PATCH v3 0/7] curl: locking cleanups/fixes, coroutine conversion, remove aio_poll, Max Reitz, 2017/05/15
- Re: [Qemu-block] [PATCH v3 0/7] curl: locking cleanups/fixes, coroutine conversion, remove aio_poll, Jeff Cody, 2017/05/16
- Re: [Qemu-block] [PATCH v3 0/7] curl: locking cleanups/fixes, coroutine conversion, remove aio_poll, Richard W.M. Jones, 2017/05/18