Patchwork [v2,09/11] curl: release everything on curl_close

login
register
mail settings
Submitter Fam Zheng
Date May 14, 2013, 2:26 a.m.
Message ID <1368498390-20738-10-git-send-email-famz@redhat.com>
Download mbox | patch
Permalink /patch/243581/
State New
Headers show

Comments

Fam Zheng - May 14, 2013, 2:26 a.m.
Release everything properly on curl_close.

Signed-off-by: Fam Zheng <famz@redhat.com>
---
 block/curl.c | 37 ++++++++++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)
Stefan Hajnoczi - May 14, 2013, 8:20 a.m.
On Tue, May 14, 2013 at 10:26:28AM +0800, Fam Zheng wrote:
> Release everything properly on curl_close.
> 
> Signed-off-by: Fam Zheng <famz@redhat.com>
> ---
>  block/curl.c | 37 ++++++++++++++++++++++++++++++++++++-
>  1 file changed, 36 insertions(+), 1 deletion(-)

Cleanup should be included in the patch that introduces a resource, for
example, s->timer.  Please squash relevant pieces into those patches.

Patch

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)