diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/examples/README | 4 | ||||
| -rw-r--r-- | docs/examples/ghiper.c | 29 |
2 files changed, 17 insertions, 16 deletions
diff --git a/docs/examples/README b/docs/examples/README index 71d0ab96e..8d2f0d7af 100644 --- a/docs/examples/README +++ b/docs/examples/README @@ -47,7 +47,9 @@ ftpupload.c - upload a file to an FTP server ftpuploadresume.c - resume an upload to an FTP server getinfo.c - get the Content-Type from the recent transfer getinmemory.c - download a file to memory only -hiperfifo.c - downloads all URLs written to the fifo +ghiper.c - curl_multi_socket() using code with glib-2 +hiperfifo.c - downloads all URLs written to the fifo, using + curl_multi_socket() and libevent htmltitle.cc - download a HTML file and extract the <title> tag from a HTML page using libxml http-post.c - HTTP POST diff --git a/docs/examples/ghiper.c b/docs/examples/ghiper.c index 1aa197a08..cd0895b5f 100644 --- a/docs/examples/ghiper.c +++ b/docs/examples/ghiper.c @@ -90,11 +90,6 @@ typedef struct _SockInfo { -static void update_timeout(GlobalInfo *g); - - - - /* Die if we get a bad CURLMcode somewhere */ static void mcode_or_die(char *where, CURLMcode code) { if ( CURLM_OK != code ) { @@ -175,25 +170,29 @@ static gboolean timer_cb(gpointer data) } while (rc == CURLM_CALL_MULTI_PERFORM); mcode_or_die("timer_cb: curl_multi_socket", rc); check_run_count(g); - if ( g->still_running ) { update_timeout(g); } return FALSE; } - /* Update the event timer after curl_multi library calls */ -static void update_timeout(GlobalInfo *g) +static int update_timeout_cb(CURLM *multi, long timeout_ms, void *userp) { - long timeout_ms; - curl_multi_timeout(g->multi, &timeout_ms); - if ( timeout_ms < 0 ) { return; } - /* MSG_OUT("update_timeout to %ld ms\n", timeout_ms); */ - g->timer_event = g_timeout_add(timeout_ms, timer_cb,g); + struct timeval timeout; + GlobalInfo *g=(GlobalInfo *)userp; + timeout.tv_sec = timeout_ms/1000; + timeout.tv_usec = (timeout_ms%1000)*1000; + + MSG_OUT("*** update_timeout_cb %ld => %ld:%ld ***\n", + timeout_ms, timeout.tv_sec, timeout.tv_usec); + + g->timer_event = g_timeout_add(timeout_ms, timer_cb, g); + return 0; } + /* Called by glib when we get action on a multi socket */ static gboolean event_cb(GIOChannel *ch, GIOCondition condition, gpointer data) { @@ -206,7 +205,6 @@ static gboolean event_cb(GIOChannel *ch, GIOCondition condition, gpointer data) mcode_or_die("event_cb: curl_multi_socket", rc); check_run_count(g); if(g->still_running) { - update_timeout(g); return TRUE; } else { MSG_OUT("last transfer done, kill timeout\n"); @@ -452,10 +450,11 @@ int main(int argc, char **argv) g->multi = curl_multi_init(); curl_multi_setopt(g->multi, CURLMOPT_SOCKETFUNCTION, sock_cb); curl_multi_setopt(g->multi, CURLMOPT_SOCKETDATA, g); + curl_multi_setopt(g->multi, CURLMOPT_TIMERFUNCTION, update_timeout_cb); + curl_multi_setopt(g->multi, CURLMOPT_TIMERDATA, g); do { rc = curl_multi_socket_all(g->multi, &g->still_running); } while (CURLM_CALL_MULTI_PERFORM == rc); - update_timeout(g); g_main_loop_run(gmain); curl_multi_cleanup(g->multi); return 0; |