From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41557) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkTez-0001U4-Lw for qemu-devel@nongnu.org; Thu, 06 Jun 2013 02:27:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UkTes-0004Mr-IP for qemu-devel@nongnu.org; Thu, 06 Jun 2013 02:26:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10304) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UkTes-0004Mh-Aj for qemu-devel@nongnu.org; Thu, 06 Jun 2013 02:26:50 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r566QnsU030148 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 6 Jun 2013 02:26:49 -0400 From: Fam Zheng Date: Thu, 6 Jun 2013 14:25:47 +0800 Message-Id: <1370499959-8916-2-git-send-email-famz@redhat.com> In-Reply-To: <1370499959-8916-1-git-send-email-famz@redhat.com> References: <1370499959-8916-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v7 01/13] curl: introduce CURLSockInfo to BDRVCURLState. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, Fam Zheng , rjones@redhat.com, stefanha@redhat.com We use socket provided by curl in the driver. Libcurl multi interface has option CURLMOPT_SOCKETFUNCTION for socket. Per man 3 curl_multi_setopt: ... CURLMOPT_SOCKETFUNCTION Pass a pointer to a function matching the curl_socket_callback prototype. The curl_multi_socket_action(3) function informs the application about updates in the socket (file descriptor) status by doing none, one, or multiple calls to the curl_socket_callback given in the param argument. They update the status with changes since the previous time a curl_multi_socket(3) function was called. If the given callback pointer is NULL, no callback will be called. Set the callback's userp argument with CURLMOPT_SOCKETDATA. See curl_multi_socket(3) for more callback details. ... The added structure store information for all the socket returned by libcurl. The most important field is action, which is used to keep what actions are needed when this socket's fd handler is called. CURLSockInfo is added here and used in later commits to save the socket actions. Signed-off-by: Fam Zheng --- block/curl.c | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/block/curl.c b/block/curl.c index b8935fd..a829fe7 100644 --- a/block/curl.c +++ b/block/curl.c @@ -75,10 +75,18 @@ typedef struct CURLState char in_use; } CURLState; +typedef struct CURLSockInfo { + curl_socket_t fd; + int action; + struct BDRVCURLState *s; + QLIST_ENTRY(CURLSockInfo) next; +} CURLSockInfo; + typedef struct BDRVCURLState { CURLM *multi; size_t len; CURLState states[CURL_NUM_STATES]; + QLIST_HEAD(, CURLSockInfo) socks; char *url; size_t readahead_size; } BDRVCURLState; @@ -88,9 +96,18 @@ static void curl_multi_do(void *arg); static int curl_aio_flush(void *opaque); static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action, - void *s, void *sp) + void *userp, void *sockp) { + BDRVCURLState *s = userp; DPRINTF("CURL (AIO): Sock action %d on fd %d\n", action, fd); + CURLSockInfo *sock = sockp; + if (!sock) { + sock = g_malloc0(sizeof(CURLSockInfo)); + sock->fd = fd; + sock->s = s; + QLIST_INSERT_HEAD(&s->socks, sock, next); + curl_multi_assign(s->multi, fd, sock); + } switch (action) { case CURL_POLL_IN: qemu_aio_set_fd_handler(fd, curl_multi_do, NULL, curl_aio_flush, s); @@ -433,6 +450,8 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags) inited = 1; } + QLIST_INIT(&s->socks); + DPRINTF("CURL: Opening %s\n", file); s->url = g_strdup(file); state = curl_init_state(s); @@ -462,8 +481,8 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags) // initialize the multi interface! s->multi = curl_multi_init(); - curl_multi_setopt( s->multi, CURLMOPT_SOCKETDATA, s); - curl_multi_setopt( s->multi, CURLMOPT_SOCKETFUNCTION, curl_sock_cb ); + curl_multi_setopt(s->multi, CURLMOPT_SOCKETDATA, s); + curl_multi_setopt(s->multi, CURLMOPT_SOCKETFUNCTION, curl_sock_cb); curl_multi_do(s); qemu_opts_del(opts); @@ -603,6 +622,14 @@ static void curl_close(BlockDriverState *bs) } if (s->multi) curl_multi_cleanup(s->multi); + + while (!QLIST_EMPTY(&s->socks)) { + CURLSockInfo *sock = QLIST_FIRST(&s->socks); + QLIST_REMOVE(sock, next); + g_free(sock); + sock = NULL; + } + g_free(s->url); } -- 1.8.3