提交 b69cdef8 编写于 作者: M Matthew Booth 提交者: Kevin Wolf

curl: Remove unnecessary explicit calls to internal event handler

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: NMatthew Booth <mbooth@redhat.com>
Tested-by: NRichard W.M. Jones <rjones@redhat.com>
Signed-off-by: NKevin Wolf <kwolf@redhat.com>
上级 e4661837
...@@ -535,7 +535,6 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags, ...@@ -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_TIMERDATA, s);
curl_multi_setopt(s->multi, CURLMOPT_TIMERFUNCTION, curl_timer_cb); curl_multi_setopt(s->multi, CURLMOPT_TIMERFUNCTION, curl_timer_cb);
#endif #endif
curl_multi_do(s);
qemu_opts_del(opts); qemu_opts_del(opts);
return 0; return 0;
...@@ -564,6 +563,7 @@ static const AIOCBInfo curl_aiocb_info = { ...@@ -564,6 +563,7 @@ static const AIOCBInfo curl_aiocb_info = {
static void curl_readv_bh_cb(void *p) static void curl_readv_bh_cb(void *p)
{ {
CURLState *state; CURLState *state;
int running;
CURLAIOCB *acb = p; CURLAIOCB *acb = p;
BDRVCURLState *s = acb->common.bs->opaque; BDRVCURLState *s = acb->common.bs->opaque;
...@@ -612,8 +612,9 @@ static void curl_readv_bh_cb(void *p) ...@@ -612,8 +612,9 @@ static void curl_readv_bh_cb(void *p)
curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range); curl_easy_setopt(state->curl, CURLOPT_RANGE, state->range);
curl_multi_add_handle(s->multi, state->curl); 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, static BlockDriverAIOCB *curl_aio_readv(BlockDriverState *bs,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册