|
 |
9ae3a8 |
From 3ed5149c2375201051e0e8d38146dffaa0452fcd Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Richard Jones <rjones@redhat.com>
|
|
|
9ae3a8 |
Date: Thu, 11 Jun 2015 11:40:15 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 15/30] curl: Remove unnecessary explicit calls to internal
|
|
|
9ae3a8 |
event handler
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Message-id: <1434022828-13037-9-git-send-email-rjones@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 65843
|
|
|
9ae3a8 |
O-Subject: [RHEL-7.2 qemu-kvm v3 PATCH 08/21] curl: Remove unnecessary explicit calls to internal event handler
|
|
|
9ae3a8 |
Bugzilla: 1226684
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Matthew Booth <mbooth@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Remove calls to curl_multi_do where the relevant handles are already
|
|
|
9ae3a8 |
registered to the event loop.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Ensure that we kick off socket handling with CURL_SOCKET_TIMEOUT after
|
|
|
9ae3a8 |
adding a new handle.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Matthew Booth <mbooth@redhat.com>
|
|
|
9ae3a8 |
Tested-by: Richard W.M. Jones <rjones@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Upstream-status: b69cdef876340624bb40a2054d14f298471a40a6
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/curl.c | 5 +++--
|
|
|
9ae3a8 |
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/curl.c b/block/curl.c
|
|
|
9ae3a8 |
index a6631fe..e4332c5 100644
|
|
|
9ae3a8 |
--- a/block/curl.c
|
|
|
9ae3a8 |
+++ b/block/curl.c
|
|
|
9ae3a8 |
@@ -523,7 +523,6 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
|
|
|
9ae3a8 |
curl_multi_setopt(s->multi, CURLMOPT_TIMERDATA, s);
|
|
|
9ae3a8 |
curl_multi_setopt(s->multi, CURLMOPT_TIMERFUNCTION, curl_timer_cb);
|
|
|
9ae3a8 |
#endif
|
|
|
9ae3a8 |
- curl_multi_do(s);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
qemu_opts_del(opts);
|
|
|
9ae3a8 |
return 0;
|
|
|
9ae3a8 |
@@ -567,6 +566,7 @@ static const AIOCBInfo curl_aiocb_info = {
|
|
|
9ae3a8 |
static void curl_readv_bh_cb(void *p)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
CURLState *state;
|
|
|
9ae3a8 |
+ int running;
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
CURLAIOCB *acb = p;
|
|
|
9ae3a8 |
BDRVCURLState *s = acb->common.bs->opaque;
|
|
|
9ae3a8 |
@@ -615,8 +615,9 @@ static void curl_readv_bh_cb(void *p)
|
|
|
9ae3a8 |
curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
curl_multi_add_handle(s->multi, state->curl);
|
|
|
9ae3a8 |
- curl_multi_do(s);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ /* Tell curl it needs to kick things off */
|
|
|
9ae3a8 |
+ curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs,
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|