[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 09/11] curl: release everything on curl_close
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v2 09/11] curl: release everything on curl_close |
Date: |
Tue, 14 May 2013 10:26:28 +0800 |
Release everything properly on curl_close.
Signed-off-by: Fam Zheng <address@hidden>
---
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)
--
1.8.1.4
- Re: [Qemu-devel] [PATCH v2 01/11] curl: introduce CURLSockInfo to BDRVCURLState., (continued)
- [Qemu-devel] [PATCH v2 02/11] curl: change magic number to macro, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 03/11] curl: change curl_multi_do to curl_fd_handler, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 04/11] curl: fix curl_open, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 05/11] curl: add timer to BDRVCURLState, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 06/11] curl: introduce CURLDataCache, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 07/11] curl: make use of CURLDataCache., Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 08/11] curl: use list to store CURLState, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 09/11] curl: release everything on curl_close,
Fam Zheng <=
- [Qemu-devel] [PATCH v2 10/11] curl: add cache quota., Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 11/11] curl: introduce ssl_no_cert runtime option., Fam Zheng, 2013/05/13
- Re: [Qemu-devel] [PATCH v2 00/11] curl: fix curl read, Stefan Hajnoczi, 2013/05/14