[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 10/16] curl: Report only ready sockets
From: |
Max Reitz |
Subject: |
[Qemu-block] [PULL 10/16] curl: Report only ready sockets |
Date: |
Mon, 16 Sep 2019 16:22:40 +0200 |
Instead of reporting all sockets to cURL, only report the one that has
caused curl_multi_do_locked() to be called. This lets us get rid of the
QLIST_FOREACH_SAFE() list, which was actually wrong: SAFE foreaches are
only safe when the current element is removed in each iteration. If it
possible for the list to be concurrently modified, we cannot guarantee
that only the current element will be removed. Therefore, we must not
use QLIST_FOREACH_SAFE() here.
Fixes: ff5ca1664af85b24a4180d595ea6873fd3deac57
Cc: address@hidden
Signed-off-by: Max Reitz <address@hidden>
Message-id: address@hidden
Reviewed-by: Maxim Levitsky <address@hidden>
Reviewed-by: John Snow <address@hidden>
Signed-off-by: Max Reitz <address@hidden>
---
block/curl.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/block/curl.c b/block/curl.c
index cf2686218d..fd70f1ebc4 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -392,24 +392,19 @@ static void curl_multi_check_completion(BDRVCURLState *s)
}
/* Called with s->mutex held. */
-static void curl_multi_do_locked(CURLSocket *ready_socket)
+static void curl_multi_do_locked(CURLSocket *socket)
{
- CURLSocket *socket, *next_socket;
- CURLState *s = ready_socket->state;
+ BDRVCURLState *s = socket->state->s;
int running;
int r;
- if (!s->s->multi) {
+ if (!s->multi) {
return;
}
- /* Need to use _SAFE because curl_multi_socket_action() may trigger
- * curl_sock_cb() which might modify this list */
- QLIST_FOREACH_SAFE(socket, &s->sockets, next, next_socket) {
- do {
- r = curl_multi_socket_action(s->s->multi, socket->fd, 0, &running);
- } while (r == CURLM_CALL_MULTI_PERFORM);
- }
+ do {
+ r = curl_multi_socket_action(s->multi, socket->fd, 0, &running);
+ } while (r == CURLM_CALL_MULTI_PERFORM);
}
static void curl_multi_do(void *arg)
--
2.21.0
- [Qemu-block] [PULL 00/16] Block patches, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 01/16] block: Use QEMU_IS_ALIGNED, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 02/16] block: Remove unused masks, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 03/16] tests/qemu-iotests/check: Replace "tests" with "iotests" in final status text, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 04/16] tests/Makefile: Do not print the name of the check-block.sh shell script, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 06/16] curl: Keep pointer to the CURLState in CURLSocket, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 05/16] tests/qemu-iotests: Fix qemu-io related output in 026.out.nocache, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 07/16] curl: Keep *socket until the end of curl_sock_cb(), Max Reitz, 2019/09/16
- [Qemu-block] [PULL 08/16] curl: Check completion in curl_multi_do(), Max Reitz, 2019/09/16
- [Qemu-block] [PULL 09/16] curl: Pass CURLSocket to curl_multi_do(), Max Reitz, 2019/09/16
- [Qemu-block] [PULL 10/16] curl: Report only ready sockets,
Max Reitz <=
- [Qemu-block] [PULL 11/16] curl: Handle success in multi_check_completion, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 12/16] curl: Check curl_multi_add_handle()'s return code, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 13/16] blockjob: update nodes head while removing all bdrv, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 14/16] block/qcow2: Fix corruption introduced by commit 8ac0f15f335, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 15/16] block/qcow2: refactor encryption code, Max Reitz, 2019/09/16
- [Qemu-block] [PULL 16/16] qemu-iotests: Add test for bz #1745922, Max Reitz, 2019/09/16
- Re: [Qemu-block] [Qemu-devel] [PULL 00/16] Block patches, no-reply, 2019/09/16
- Re: [Qemu-block] [PULL 00/16] Block patches, Peter Maydell, 2019/09/17