[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/8] curl: Remove unnecessary explicit calls to inte
From: |
Matthew Booth |
Subject: |
[Qemu-devel] [PATCH 5/8] curl: Remove unnecessary explicit calls to internal event handler |
Date: |
Tue, 29 Apr 2014 16:03:29 +0100 |
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 <address@hidden>
---
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);
}
static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs,
--
1.9.0
- [Qemu-devel] [PATCH 0/8] curl: Fix hang reading from slow connections, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 1/8] curl: Fix long line, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 2/8] curl: Remove unnecessary use of goto, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 5/8] curl: Remove unnecessary explicit calls to internal event handler,
Matthew Booth <=
- [Qemu-devel] [PATCH 4/8] curl: Remove erroneous sleep waiting for curl completion, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 7/8] curl: Ensure all informationals are checked for completion, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 3/8] curl: Fix return from curl_read_cb with invalid state, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 6/8] curl: Eliminate unnecessary use of curl_multi_socket_all, Matthew Booth, 2014/04/29
- [Qemu-devel] [PATCH 8/8] curl: Fix hang reading from slow connections, Matthew Booth, 2014/04/29
- Re: [Qemu-devel] [PATCH 0/8] curl: Fix hang reading from slow connections, Richard W.M. Jones, 2014/04/29
- Re: [Qemu-devel] [PATCH 0/8] curl: Fix hang reading from slow connections, Kevin Wolf, 2014/04/30