From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59043) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc4xH-0003C7-8M for qemu-devel@nongnu.org; Mon, 13 May 2013 22:27:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uc4xE-0003Rk-Op for qemu-devel@nongnu.org; Mon, 13 May 2013 22:27:07 -0400 Received: from mx1.redhat.com ([209.132.183.28]:61156) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uc4xE-0003R0-GT for qemu-devel@nongnu.org; Mon, 13 May 2013 22:27:04 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r4E2R3ks021275 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 13 May 2013 22:27:04 -0400 From: Fam Zheng Date: Tue, 14 May 2013 10:26:24 +0800 Message-Id: <1368498390-20738-6-git-send-email-famz@redhat.com> In-Reply-To: <1368498390-20738-1-git-send-email-famz@redhat.com> References: <1368498390-20738-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v2 05/11] curl: add timer to BDRVCURLState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, jcody@redhat.com, Fam Zheng , stefanha@redhat.com 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 --- 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