From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:44317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcA9G-0004Rc-VV for qemu-devel@nongnu.org; Tue, 14 May 2013 03:59:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UcA9F-0001Nr-Li for qemu-devel@nongnu.org; Tue, 14 May 2013 03:59:50 -0400 Received: from mail-wi0-x22f.google.com ([2a00:1450:400c:c05::22f]:53078) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UcA9F-0001Nf-FF for qemu-devel@nongnu.org; Tue, 14 May 2013 03:59:49 -0400 Received: by mail-wi0-f175.google.com with SMTP id hn14so1359212wib.2 for ; Tue, 14 May 2013 00:59:48 -0700 (PDT) Date: Tue, 14 May 2013 09:59:45 +0200 From: Stefan Hajnoczi Message-ID: <20130514075945.GC3632@stefanha-thinkpad.redhat.com> References: <1368498390-20738-1-git-send-email-famz@redhat.com> <1368498390-20738-2-git-send-email-famz@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1368498390-20738-2-git-send-email-famz@redhat.com> Subject: Re: [Qemu-devel] [PATCH v2 01/11] curl: introduce CURLSockInfo to BDRVCURLState. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng Cc: kwolf@redhat.com, jcody@redhat.com, qemu-devel@nongnu.org, stefanha@redhat.com On Tue, May 14, 2013 at 10:26:20AM +0800, Fam Zheng wrote: > 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. > > Signed-off-by: Fam Zheng > --- > block/curl.c | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/block/curl.c b/block/curl.c > index b8935fd..14f4552 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; This patch doesn't make sense by itself. CURLSockInfo is unused and ->action is never assigned to. I guess this will eventually replace BDRVCURLState->states[] but at this point in the patch series it is hard to tell - it would be nice to explain this in the commit description. > typedef struct BDRVCURLState { > CURLM *multi; > size_t len; > CURLState states[CURL_NUM_STATES]; > + QLIST_HEAD(, CURLSockInfo) socks; > char *url; > size_t readahead_size; > } BDRVCURLState; > @@ -90,7 +98,16 @@ static int curl_aio_flush(void *opaque); > static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action, > void *s, void *sp) > { > + BDRVCURLState *bs = (BDRVCURLState *)s; void * is automatically coerced to any pointer type. No need for a type cast. > DPRINTF("CURL (AIO): Sock action %d on fd %d\n", action, fd); > + CURLSockInfo *sock = (CURLSockInfo *)sp; Same here. > + if (!sp) { > + sock = g_malloc0(sizeof(CURLSockInfo)); > + sock->fd = fd; > + sock->s = bs; > + QLIST_INSERT_HEAD(&bs->socks, sock, next); > + curl_multi_assign(bs->multi, fd, sock); > + } > switch (action) { > case CURL_POLL_IN: > qemu_aio_set_fd_handler(fd, curl_multi_do, NULL, curl_aio_flush, s); > @@ -462,8 +479,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); > -- > 1.8.1.4 > >