ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

curl: Ensure all informationals are checked for completion 

According to the documentation, the correct way to ensure all
informationals have been returned by curl_multi_info_read is to loop
until it returns NULL.

Signed-off-by: Matthew Booth <mbooth@redhat.com>
Tested-by: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Matthew Booth 2014-04-29 16:03:31 +01:00 committed by Kevin Wolf
parent 838ef60249
commit 1f2cead324
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
block/curl.c
View File

@ -248,46 +248,39 @@ static void curl_multi_check_completion(BDRVCURLState *s)
/* Try to find done transfers, so we can free the easy /* Try to find done transfers, so we can free the easy
* handle again. */ * handle again. */
do { for (;;) {
CURLMsg *msg; CURLMsg *msg;
msg = curl_multi_info_read(s->multi, &msgs_in_queue); msg = curl_multi_info_read(s->multi, &msgs_in_queue);
/* Quit when there are no more completions */
if (!msg) if (!msg)
break; break;
if (msg->msg == CURLMSG_NONE)
break;
switch (msg->msg) { if (msg->msg == CURLMSG_DONE) {
case CURLMSG_DONE: CURLState *state = NULL;
{ curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE,
CURLState *state = NULL; (char **)&state);
curl_easy_getinfo(msg->easy_handle, CURLINFO_PRIVATE,
(char **)&state);
/* ACBs for successful messages get completed in curl_read_cb */ /* ACBs for successful messages get completed in curl_read_cb */
if (msg->data.result != CURLE_OK) { if (msg->data.result != CURLE_OK) {
int i; int i;
for (i = 0; i < CURL_NUM_ACB; i++) { for (i = 0; i < CURL_NUM_ACB; i++) {
CURLAIOCB *acb = state->acb[i]; CURLAIOCB *acb = state->acb[i];
if (acb == NULL) { if (acb == NULL) {
continue; continue;
}
acb->common.cb(acb->common.opaque, -EIO);
qemu_aio_release(acb);
state->acb[i] = NULL;
} }
}
curl_clean_state(state); acb->common.cb(acb->common.opaque, -EIO);
break; qemu_aio_release(acb);
state->acb[i] = NULL;
}
} }
default:
msgs_in_queue = 0; curl_clean_state(state);
break; break;
} }
} while(msgs_in_queue); }
} }
static void curl_multi_do(void *arg) static void curl_multi_do(void *arg)