Make it consistent to other structures to use QLIST to store CURLState.
It also simplifies initialization and releasing of data.
Signed-off-by: Fam Zheng <f...@redhat.com>
---
block/curl.c | 95 ++++++++++++++++++++++++++++++++----------------------------
1 file changed, 50 insertions(+), 45 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index 7336cdb..f7358de 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -38,7 +38,6 @@
CURLPROTO_FTP | CURLPROTO_FTPS | \
CURLPROTO_TFTP)
-#define CURL_NUM_STATES 8
#define SECTOR_SIZE 512
#define READ_AHEAD_SIZE (256 * 1024)
@@ -64,14 +63,13 @@ typedef struct CURLDataCache {
QLIST_ENTRY(CURLDataCache) next;
} CURLDataCache;
-typedef struct CURLState
-{
+typedef struct CURLState {
struct BDRVCURLState *s;
CURL *curl;
char range[128];
char errmsg[CURL_ERROR_SIZE];
CURLDataCache *cache;
- char in_use;
+ QLIST_ENTRY(CURLState) next;
} CURLState;
typedef struct CURLSockInfo {
@@ -84,7 +82,7 @@ typedef struct CURLSockInfo {
typedef struct BDRVCURLState {
CURLM *multi;
size_t len;
- CURLState states[CURL_NUM_STATES];
+ QLIST_HEAD(, CURLState) curl_states;
QLIST_HEAD(, CURLAIOCB) acbs;
QLIST_HEAD(, CURLSockInfo) socks;
char *url;
@@ -300,6 +298,9 @@ static void curl_fd_handler(void *arg)
}
curl_clean_state(state);
+ QLIST_REMOVE(state, next);
+ g_free(state);
+ state = NULL;
break;
}
default:
@@ -311,29 +312,17 @@ static void curl_fd_handler(void *arg)
static CURLState *curl_init_state(BDRVCURLState *s)
{
- CURLState *state = NULL;
- int i;
-
- do {
- for (i=0; i<CURL_NUM_STATES; i++) {
- if (s->states[i].in_use)
- continue;
-
- state = &s->states[i];
- state->in_use = 1;
- break;
- }
- if (!state) {
- g_usleep(100);
- }
- } while(!state);
-
- if (state->curl)
- goto has_curl;
+ CURLState *state;
+ state = g_malloc0(sizeof(CURLState));
+ state->s = s;
state->curl = curl_easy_init();
- if (!state->curl)
- return NULL;
+ if (!state->curl) {
+ DPRINTF("CURL: curl_easy_init failed\n");
+ g_free(state);
+ state = NULL;
+ goto out;
+ }
curl_easy_setopt(state->curl, CURLOPT_URL, s->url);
curl_easy_setopt(state->curl, CURLOPT_TIMEOUT, 5);
curl_easy_setopt(state->curl, CURLOPT_WRITEFUNCTION, (void *)curl_read_cb);
@@ -359,19 +348,19 @@ static CURLState *curl_init_state(BDRVCURLState *s)
#ifdef DEBUG_VERBOSE
curl_easy_setopt(state->curl, CURLOPT_VERBOSE, 1);
#endif
-
-has_curl:
-
- state->s = s;
-
+out:
return state;
}
static void curl_clean_state(CURLState *s)
{
- if (s->s->multi)
- curl_multi_remove_handle(s->s->multi, s->curl);
- s->in_use = 0;
+ if (s->curl) {
+ if (s->s->multi) {
+ curl_multi_remove_handle(s->s->multi, s->curl);
+ }
+ curl_easy_cleanup(s->curl);
+ s->curl = NULL;
+ }
if (s->cache) {
s->cache->use_count--;
assert(s->cache->use_count >= 0);
@@ -513,7 +502,8 @@ static int curl_open(BlockDriverState *bs, QDict *options,
int flags)
curl_clean_state(state);
curl_easy_cleanup(state->curl);
- state->curl = NULL;
+ g_free(state);
+ state = NULL;
// Now we know the file exists and its size, so let's
// initialize the multi interface!
@@ -603,6 +593,7 @@ static void curl_readv_bh_cb(void *p)
cache->base_pos + cache->data_len);
DPRINTF("Reading range: %s\n", state->range);
curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);
+ QLIST_INSERT_HEAD(&s->curl_states, state, next);
QLIST_INSERT_HEAD(&s->cache, cache, next);
state->cache = cache;
cache->use_count++;
@@ -624,7 +615,6 @@ err_release:
qemu_aio_release(acb);
return;
-
}
static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs,
@@ -653,9 +643,13 @@ static BlockDriverAIOCB *curl_aio_readv(BlockDriverState
*bs,
static void curl_close(BlockDriverState *bs)
{
BDRVCURLState *s = bs->opaque;
- int i;
DPRINTF("CURL: Close\n");
+ if (s->timer) {
+ qemu_del_timer(s->timer);
+ qemu_free_timer(s->timer);
+ s->timer = NULL;
+ }
if (s->timer) {
qemu_del_timer(s->timer);
@@ -663,16 +657,26 @@ static void curl_close(BlockDriverState *bs)
s->timer = NULL;
}
- for (i=0; i<CURL_NUM_STATES; i++) {
- if (s->states[i].in_use)
- curl_clean_state(&s->states[i]);
- if (s->states[i].curl) {
- curl_easy_cleanup(s->states[i].curl);
- s->states[i].curl = NULL;
- }
+ while (!QLIST_EMPTY(&s->curl_states)) {
+ CURLState *state = QLIST_FIRST(&s->curl_states);
+ /* Remove and clean curl easy handles */
+ curl_clean_state(state);
+ QLIST_REMOVE(state, next);
+ g_free(state);
+ state = NULL;
}
- if (s->multi)
+
+ if (s->multi) {
curl_multi_cleanup(s->multi);
+ }
+
+ while (!QLIST_EMPTY(&s->acbs)) {
+ CURLAIOCB *acb = QLIST_FIRST(&s->acbs);
+ acb->common.cb(acb->common.opaque, -EIO);
+ QLIST_REMOVE(acb, next);
+ g_free(acb);
+ acb = NULL;
+ }
while (!QLIST_EMPTY(&s->cache)) {
CURLDataCache *cache = QLIST_FIRST(&s->cache);
@@ -694,6 +698,7 @@ static void curl_close(BlockDriverState *bs)
}
g_free(s->url);
+ s->url = NULL;
}
static int64_t curl_getlength(BlockDriverState *bs)
--
1.8.1.4
