[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 05/11] curl: add timer to BDRVCURLState
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PATCH v2 05/11] curl: add timer to BDRVCURLState |
Date: |
Tue, 14 May 2013 10:26:24 +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 | 35 +++++++++++++++++++++++++++++++++++
1 file changed, 35 insertions(+)
diff --git a/block/curl.c b/block/curl.c
index f47796b..61d0d6f 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -90,6 +90,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;
@@ -149,6 +150,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 *bs = (BDRVCURLState *)opaque;
+ DPRINTF("curl timeout!\n");
+ curl_multi_socket_action(bs->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 *bs = (BDRVCURLState *)s;
+ DPRINTF("curl multi timer cb, timeout: %ld (ms)\n", timeout_ms);
+ if (timeout_ms < 0) {
+ if (bs->timer) {
+ qemu_del_timer(bs->timer);
+ qemu_free_timer(bs->timer);
+ bs->timer = NULL;
+ }
+ } else if (timeout_ms == 0) {
+ curl_timer_cb(bs);
+ } else {
+ if (!bs->timer) {
+ bs->timer = qemu_new_timer_ms(host_clock, curl_timer_cb, s);
+ assert(bs->timer);
+ }
+ qemu_mod_timer(bs->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);
@@ -506,6 +539,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);
--
1.8.1.4
- [Qemu-devel] [PATCH v2 00/11] curl: fix curl read, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 01/11] curl: introduce CURLSockInfo to BDRVCURLState., Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 02/11] curl: change magic number to macro, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 03/11] curl: change curl_multi_do to curl_fd_handler, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 04/11] curl: fix curl_open, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 05/11] curl: add timer to BDRVCURLState,
Fam Zheng <=
- [Qemu-devel] [PATCH v2 06/11] curl: introduce CURLDataCache, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 07/11] curl: make use of CURLDataCache., Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 08/11] curl: use list to store CURLState, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 09/11] curl: release everything on curl_close, Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 10/11] curl: add cache quota., Fam Zheng, 2013/05/13
- [Qemu-devel] [PATCH v2 11/11] curl: introduce ssl_no_cert runtime option., Fam Zheng, 2013/05/13
- Re: [Qemu-devel] [PATCH v2 00/11] curl: fix curl read, Stefan Hajnoczi, 2013/05/14