From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32926) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whegv-0006o2-H8 for qemu-devel@nongnu.org; Tue, 06 May 2014 08:41:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Whegu-0005LS-LA for qemu-devel@nongnu.org; Tue, 06 May 2014 08:41:49 -0400 Received: from mx1.redhat.com ([209.132.183.28]:17550) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Whegu-0005LO-DA for qemu-devel@nongnu.org; Tue, 06 May 2014 08:41:48 -0400 Message-ID: <5368D888.4010603@redhat.com> Date: Tue, 06 May 2014 13:41:44 +0100 From: Matthew Booth MIME-Version: 1.0 References: <1398882243-14783-1-git-send-email-kwolf@redhat.com> <1398882243-14783-29-git-send-email-kwolf@redhat.com> <20140506095624.GB3941@noname.str.redhat.com> In-Reply-To: <20140506095624.GB3941@noname.str.redhat.com> Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 28/31] curl: Remove unnecessary explicit calls to internal event handler List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , Laurent Desnogues Cc: "qemu-devel@nongnu.org" On 06/05/14 10:56, Kevin Wolf wrote: > Am 06.05.2014 um 11:44 hat Laurent Desnogues geschrieben: >> Hello, >> >> sorry for another late detection of the use of too recent features. >> >> On Wed, Apr 30, 2014 at 8:24 PM, Kevin Wolf wrote: >>> From: Matthew Booth >>> >>> Remove calls to curl_multi_do where the relevant handles are already >>> registered to the event loop. >>> >>> Ensure that we kick off socket handling with CURL_SOCKET_TIMEOUT after >>> adding a new handle. >>> >>> Signed-off-by: Matthew Booth >>> Tested-by: Richard W.M. Jones >>> Signed-off-by: Kevin Wolf >>> --- >>> block/curl.c | 5 +++-- >>> 1 file changed, 3 insertions(+), 2 deletions(-) >>> >>> diff --git a/block/curl.c b/block/curl.c >>> index 50bd05f..fd2756e 100644 >>> --- a/block/curl.c >>> +++ b/block/curl.c >>> @@ -535,7 +535,6 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, >>> curl_multi_setopt(s->multi, CURLMOPT_TIMERDATA, s); >>> curl_multi_setopt(s->multi, CURLMOPT_TIMERFUNCTION, curl_timer_cb); >>> #endif >>> - curl_multi_do(s); >>> >>> qemu_opts_del(opts); >>> return 0; >>> @@ -564,6 +563,7 @@ static const AIOCBInfo curl_aiocb_info = { >>> static void curl_readv_bh_cb(void *p) >>> { >>> CURLState *state; >>> + int running; >>> >>> CURLAIOCB *acb = p; >>> BDRVCURLState *s = acb->common.bs->opaque; >>> @@ -612,8 +612,9 @@ static void curl_readv_bh_cb(void *p) >>> curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range); >>> >>> curl_multi_add_handle(s->multi, state->curl); >>> - curl_multi_do(s); >>> >>> + /* Tell curl it needs to kick things off */ >>> + curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running); >> >> curl_multi_socket_action isn't available on the CURL lib used >> by CentOS 5.6. The obvious workaround is to disable CURL >> when calling configure. > > Matthew, can you please check whether this call can be avoided, or > otherwise change configure to check the presence of the function? I should be able to sort this if I can work out how to add a configure test. When do you need it by? If I'm too slow it's safe to revert this change. It's just a cleanup to remove use of a deprecated api. Matt -- Matthew Booth Red Hat Engineering, Virtualisation Team Phone: +442070094448 (UK) GPG ID: D33C3490 GPG FPR: 3733 612D 2D05 5458 8A8A 1600 3441 EA19 D33C 3490