[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 05/13] curl: add timer to BDRVCURLState
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v7 05/13] curl: add timer to BDRVCURLState |
Date: |
Thu, 6 Jun 2013 14:25:51 +0800 |
libcurl uses timer to manage ongoing sockets, it needs us to supply
timer. This patch introduce QEMUTimer to BDRVCURLState and handles
timeouts as libcurl expects (curl_multi_timer_cb sets given timeout
value on the timer and curl_timer_cb calls curl_multi_socket_action on
triggered).
Signed-off-by: Fam Zheng <address@hidden>
---
block/curl.c | 42 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 42 insertions(+)
diff --git a/block/curl.c b/block/curl.c
index d238489..bb46c8f 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -89,6 +89,7 @@ typedef struct BDRVCURLState {
QLIST_HEAD(, CURLSockInfo) socks;
char *url;
size_t readahead_size;
+ QEMUTimer *timer;
/* Whether http server accept range in header */
bool accept_range;
} BDRVCURLState;
@@ -148,6 +149,38 @@ static size_t curl_header_cb(void *ptr, size_t size,
size_t nmemb, void *opaque)
return realsize;
}
+static void curl_timer_cb(void *opaque)
+{
+ int running;
+ BDRVCURLState *s = opaque;
+ DPRINTF("curl timeout!\n");
+ curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);
+}
+
+/* Call back for curl_multi interface */
+static int curl_multi_timer_cb(CURLM *multi, long timeout_ms, void *s_)
+{
+ BDRVCURLState *s = s_;
+ DPRINTF("curl multi timer cb, timeout: %ld (ms)\n", timeout_ms);
+ if (timeout_ms < 0) {
+ if (s->timer) {
+ qemu_del_timer(s->timer);
+ qemu_free_timer(s->timer);
+ s->timer = NULL;
+ }
+ } else if (timeout_ms == 0) {
+ curl_timer_cb(s);
+ } else {
+ if (!s->timer) {
+ s->timer = qemu_new_timer_ms(host_clock, curl_timer_cb, s);
+ assert(s->timer);
+ }
+ qemu_mod_timer(s->timer, qemu_get_clock_ms(host_clock) + timeout_ms);
+ }
+
+ return 0;
+}
+
static size_t curl_read_cb(void *ptr, size_t size, size_t nmemb, void *opaque)
{
CURLState *s = ((CURLState*)opaque);
@@ -509,6 +542,8 @@ static int curl_open(BlockDriverState *bs, QDict *options,
int flags)
}
curl_multi_setopt(s->multi, CURLMOPT_SOCKETDATA, s);
curl_multi_setopt(s->multi, CURLMOPT_SOCKETFUNCTION, curl_sock_cb);
+ curl_multi_setopt(s->multi, CURLMOPT_TIMERDATA, s);
+ curl_multi_setopt(s->multi, CURLMOPT_TIMERFUNCTION, curl_multi_timer_cb);
curl_multi_socket_action(s->multi, CURL_SOCKET_TIMEOUT, 0, &running);
qemu_opts_del(opts);
@@ -634,6 +669,13 @@ static void curl_close(BlockDriverState *bs)
int i;
DPRINTF("CURL: Close\n");
+
+ if (s->timer) {
+ qemu_del_timer(s->timer);
+ qemu_free_timer(s->timer);
+ s->timer = NULL;
+ }
+
for (i=0; i<CURL_NUM_STATES; i++) {
if (s->states[i].in_use)
curl_clean_state(&s->states[i]);
--
1.8.3
- [Qemu-devel] [PATCH v7 00/13] curl: fix curl read, Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 01/13] curl: introduce CURLSockInfo to BDRVCURLState., Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 02/13] curl: change magic number to sizeof, Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 03/13] curl: change curl_multi_do to curl_fd_handler, Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 04/13] curl: fix curl_open, Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 05/13] curl: add timer to BDRVCURLState,
Fam Zheng <=
- [Qemu-devel] [PATCH v7 06/13] curl: introduce CURLDataCache, Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 07/13] curl: make use of CURLDataCache., Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 08/13] curl: use list to store CURLState, Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 09/13] curl: add cache quota., Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 10/13] curl: introduce ssl_no_cert runtime option., Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 11/13] block/curl.c: Refuse to open the handle for writes., Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 12/13] curl: set s->url to NULL after free., Fam Zheng, 2013/06/06
- [Qemu-devel] [PATCH v7 13/13] curl: change timeout to 30 seconds, Fam Zheng, 2013/06/06
- Re: [Qemu-devel] [PATCH v7 00/13] curl: fix curl read, Richard W.M. Jones, 2013/06/06