From patchwork Wed May 22 03:16:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 245494 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CE6252C0085 for ; Wed, 22 May 2013 13:20:43 +1000 (EST) Received: from localhost ([::1]:34148 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UezbW-0004DO-0X for incoming@patchwork.ozlabs.org; Tue, 21 May 2013 23:20:42 -0400 Received: from eggs.gnu.org ([208.118.235.92]:34401) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UezYK-0007Ll-W4 for qemu-devel@nongnu.org; Tue, 21 May 2013 23:17:35 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UezYC-0007pO-QQ for qemu-devel@nongnu.org; Tue, 21 May 2013 23:17:24 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38977) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UezYC-0007oq-CA for qemu-devel@nongnu.org; Tue, 21 May 2013 23:17:16 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4M3HFmB030962 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 21 May 2013 23:17:15 -0400 Received: from localhost.nay.redhat.com ([10.66.7.14]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r4M3GqNq024814 for ; Tue, 21 May 2013 23:17:14 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Wed, 22 May 2013 11:16:48 +0800 Message-Id: <1369192610-25003-9-git-send-email-famz@redhat.com> In-Reply-To: <1369192610-25003-1-git-send-email-famz@redhat.com> References: <1369192610-25003-1-git-send-email-famz@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v4 08/10] curl: use list to store CURLState X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- block/curl.c | 96 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 51 insertions(+), 45 deletions(-) diff --git a/block/curl.c b/block/curl.c index 4c4752b..3ea2552 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; @@ -303,6 +301,9 @@ static void curl_fd_handler(void *arg) } curl_clean_state(state); + QLIST_REMOVE(state, next); + g_free(state); + state = NULL; break; } default: @@ -314,29 +315,17 @@ static void curl_fd_handler(void *arg) static CURLState *curl_init_state(BDRVCURLState *s) { - CURLState *state = NULL; - int i; - - do { - for (i=0; istates[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); @@ -362,19 +351,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); @@ -483,6 +472,7 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags) QLIST_INIT(&s->socks); QLIST_INIT(&s->cache); QLIST_INIT(&s->acbs); + QLIST_INIT(&s->curl_states); DPRINTF("CURL: Opening %s\n", file); s->url = g_strdup(file); @@ -520,7 +510,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! @@ -610,6 +601,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++; @@ -631,7 +623,6 @@ err_release: qemu_aio_release(acb); return; - } static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs, @@ -660,9 +651,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); @@ -670,16 +665,26 @@ static void curl_close(BlockDriverState *bs) s->timer = NULL; } - for (i=0; istates[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); + qemu_aio_release(acb); + acb = NULL; + } while (!QLIST_EMPTY(&s->acbs)) { CURLAIOCB *acb = QLIST_FIRST(&s->acbs); @@ -709,6 +714,7 @@ static void curl_close(BlockDriverState *bs) } g_free(s->url); + s->url = NULL; } static int64_t curl_getlength(BlockDriverState *bs)