[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-stable] [PATCH v2 3/7] curl: Check completion in curl_multi_do()
From: |
Max Reitz |
Subject: |
[Qemu-stable] [PATCH v2 3/7] curl: Check completion in curl_multi_do() |
Date: |
Tue, 10 Sep 2019 14:41:32 +0200 |
While it is more likely that transfers complete after some file
descriptor has data ready to read, we probably should not rely on it.
Better be safe than sorry and call curl_multi_check_completion() in
curl_multi_do(), too, just like it is done in curl_multi_read().
With this change, curl_multi_do() and curl_multi_read() are actually the
same, so drop curl_multi_read() and use curl_multi_do() as the sole FD
handler.
Signed-off-by: Max Reitz <address@hidden>
---
block/curl.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index 95d7b77dc0..5838afef99 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -139,7 +139,6 @@ typedef struct BDRVCURLState {
static void curl_clean_state(CURLState *s);
static void curl_multi_do(void *arg);
-static void curl_multi_read(void *arg);
#ifdef NEED_CURL_TIMER_CALLBACK
/* Called from curl_multi_do_locked, with s->mutex held. */
@@ -186,7 +185,7 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int
action,
switch (action) {
case CURL_POLL_IN:
aio_set_fd_handler(s->aio_context, fd, false,
- curl_multi_read, NULL, NULL, state);
+ curl_multi_do, NULL, NULL, state);
break;
case CURL_POLL_OUT:
aio_set_fd_handler(s->aio_context, fd, false,
@@ -194,7 +193,7 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int
action,
break;
case CURL_POLL_INOUT:
aio_set_fd_handler(s->aio_context, fd, false,
- curl_multi_read, curl_multi_do, NULL, state);
+ curl_multi_do, curl_multi_do, NULL, state);
break;
case CURL_POLL_REMOVE:
aio_set_fd_handler(s->aio_context, fd, false,
@@ -416,15 +415,6 @@ static void curl_multi_do(void *arg)
{
CURLState *s = (CURLState *)arg;
- qemu_mutex_lock(&s->s->mutex);
- curl_multi_do_locked(s);
- qemu_mutex_unlock(&s->s->mutex);
-}
-
-static void curl_multi_read(void *arg)
-{
- CURLState *s = (CURLState *)arg;
-
qemu_mutex_lock(&s->s->mutex);
curl_multi_do_locked(s);
curl_multi_check_completion(s->s);
--
2.21.0
- [Qemu-stable] [PATCH v2 0/7] block/curl: Fix hang and potential crash, Max Reitz, 2019/09/10
- [Qemu-stable] [PATCH v2 1/7] curl: Keep pointer to the CURLState in CURLSocket, Max Reitz, 2019/09/10
- [Qemu-stable] [PATCH v2 2/7] curl: Keep *socket until the end of curl_sock_cb(), Max Reitz, 2019/09/10
- [Qemu-stable] [PATCH v2 3/7] curl: Check completion in curl_multi_do(),
Max Reitz <=
- [Qemu-stable] [PATCH v2 4/7] curl: Pass CURLSocket to curl_multi_do(), Max Reitz, 2019/09/10
- [Qemu-stable] [PATCH v2 5/7] curl: Report only ready sockets, Max Reitz, 2019/09/10
- [Qemu-stable] [PATCH v2 6/7] curl: Handle success in multi_check_completion, Max Reitz, 2019/09/10