From patchwork Tue May 14 02:26:27 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 243567 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 C57832C00A3 for ; Tue, 14 May 2013 12:29:08 +1000 (EST) Received: from localhost ([::1]:59826 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc4zC-000613-Vz for incoming@patchwork.ozlabs.org; Mon, 13 May 2013 22:29:06 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59113) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc4xT-0003Vk-Cz for qemu-devel@nongnu.org; Mon, 13 May 2013 22:27:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uc4xQ-0003U9-G2 for qemu-devel@nongnu.org; Mon, 13 May 2013 22:27:19 -0400 Received: from mx1.redhat.com ([209.132.183.28]:3564) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc4xQ-0003U3-8E for qemu-devel@nongnu.org; Mon, 13 May 2013 22:27: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 r4E2RFpt013788 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 13 May 2013 22:27:15 -0400 Received: from fam-laptop.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 r4E2QV5m014423; Mon, 13 May 2013 22:27:12 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 14 May 2013 10:26:27 +0800 Message-Id: <1368498390-20738-9-git-send-email-famz@redhat.com> In-Reply-To: <1368498390-20738-1-git-send-email-famz@redhat.com> References: <1368498390-20738-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 Cc: kwolf@redhat.com, jcody@redhat.com, Fam Zheng , stefanha@redhat.com Subject: [Qemu-devel] [PATCH v2 08/11] 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 | 79 +++++++++++++++++++++++++++--------------------------------- 1 file changed, 35 insertions(+), 44 deletions(-) diff --git a/block/curl.c b/block/curl.c index 97642e3..f20d81c 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,15 +63,14 @@ typedef struct CURLDataCache { QLIST_ENTRY(CURLDataCache) next; } CURLDataCache; -typedef struct CURLState -{ +typedef struct CURLState { struct BDRVCURLState *s; CURL *curl; #define CURL_RANGE_SIZE 128 char range[CURL_RANGE_SIZE]; char errmsg[CURL_ERROR_SIZE]; CURLDataCache *cache; - char in_use; + QLIST_ENTRY(CURLState) next; } CURLState; typedef struct CURLSockInfo { @@ -85,7 +83,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; @@ -301,6 +299,9 @@ static void curl_fd_handler(void *arg) } curl_clean_state(state); + QLIST_REMOVE(state, next); + g_free(state); + state = NULL; break; } default: @@ -312,29 +313,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); @@ -360,19 +349,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); @@ -512,7 +501,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! @@ -602,6 +592,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++; @@ -623,7 +614,6 @@ err_release: qemu_aio_release(acb); return; - } static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs, @@ -652,17 +642,18 @@ static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs, static void curl_close(BlockDriverState *bs) { BDRVCURLState *s = bs->opaque; - int i; DPRINTF("CURL: Close\n"); - 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) curl_multi_cleanup(s->multi); g_free(s->url);