From patchwork Tue May 14 02:26:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fam Zheng X-Patchwork-Id: 243581 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 DDB422C00A3 for ; Tue, 14 May 2013 12:32:25 +1000 (EST) Received: from localhost ([::1]:42156 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc52O-0003Kv-3U for incoming@patchwork.ozlabs.org; Mon, 13 May 2013 22:32:24 -0400 Received: from eggs.gnu.org ([208.118.235.92]:59124) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc4xV-0003Zw-Oe for qemu-devel@nongnu.org; Mon, 13 May 2013 22:27:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uc4xT-0003UT-8C for qemu-devel@nongnu.org; Mon, 13 May 2013 22:27:21 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48428) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc4xS-0003UO-UI for qemu-devel@nongnu.org; Mon, 13 May 2013 22:27:19 -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 r4E2RIYX021350 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 13 May 2013 22:27:18 -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 r4E2QV5n014423; Mon, 13 May 2013 22:27:16 -0400 From: Fam Zheng To: qemu-devel@nongnu.org Date: Tue, 14 May 2013 10:26:28 +0800 Message-Id: <1368498390-20738-10-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 09/11] curl: release everything on curl_close 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 Release everything properly on curl_close. Signed-off-by: Fam Zheng --- block/curl.c | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/block/curl.c b/block/curl.c index f20d81c..bde2a55 100644 --- a/block/curl.c +++ b/block/curl.c @@ -644,6 +644,11 @@ static void curl_close(BlockDriverState *bs) BDRVCURLState *s = bs->opaque; DPRINTF("CURL: Close\n"); + if (s->timer) { + qemu_del_timer(s->timer); + qemu_free_timer(s->timer); + s->timer = NULL; + } while (!QLIST_EMPTY(&s->curl_states)) { CURLState *state = QLIST_FIRST(&s->curl_states); @@ -654,9 +659,39 @@ static void curl_close(BlockDriverState *bs) 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); + assert(cache->use_count == 0); + if (cache->data) { + g_free(cache->data); + cache->data = NULL; + } + QLIST_REMOVE(cache, next); + g_free(cache); + cache = NULL; + } + + while (!QLIST_EMPTY(&s->socks)) { + CURLSockInfo *sock = QLIST_FIRST(&s->socks); + QLIST_REMOVE(sock, next); + g_free(sock); + sock = NULL; + } + g_free(s->url); + s->url = NULL; } static int64_t curl_getlength(BlockDriverState *bs)