diff options
author | Daniel Stenberg <daniel@haxx.se> | 2019-02-22 13:44:41 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2019-02-23 23:08:38 +0100 |
commit | 47e540df8f32c8f7298ab1bc96b0087b5738c257 (patch) | |
tree | 74c313428b6ab1748ea4f45b6eac2bbf5fbcc71d /docs/examples/hiperfifo.c | |
parent | 42b30ee8f2ed947a288f55ed78c370da10e3dde4 (diff) | |
download | gnurl-47e540df8f32c8f7298ab1bc96b0087b5738c257.tar.gz gnurl-47e540df8f32c8f7298ab1bc96b0087b5738c257.tar.bz2 gnurl-47e540df8f32c8f7298ab1bc96b0087b5738c257.zip |
examples: remove recursive calls to curl_multi_socket_action
From within the timer callbacks. Recursive is problematic for several
reasons. They should still work, but this way the examples and the
documentation becomes simpler. I don't think we need to encourage
recursive calls.
Discussed in #3537
Closes #3601
Diffstat (limited to 'docs/examples/hiperfifo.c')
-rw-r--r-- | docs/examples/hiperfifo.c | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/docs/examples/hiperfifo.c b/docs/examples/hiperfifo.c index fec62b85f..f3c1bbc73 100644 --- a/docs/examples/hiperfifo.c +++ b/docs/examples/hiperfifo.c @@ -5,7 +5,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. * * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms @@ -152,23 +152,15 @@ static int multi_timer_cb(CURLM *multi _Unused, long timeout_ms, GlobalInfo *g) timeout.tv_usec = (timeout_ms%1000)*1000; fprintf(MSG_OUT, "multi_timer_cb: Setting timeout to %ld ms\n", timeout_ms); - /* TODO - * - * if timeout_ms is 0, call curl_multi_socket_action() at once! - * + /* * if timeout_ms is -1, just delete the timer * - * for all other values of timeout_ms, this should set or *update* - * the timer to the new value + * For all other values of timeout_ms, this should set or *update* the timer + * to the new value */ - if(timeout_ms == 0) { - rc = curl_multi_socket_action(g->multi, - CURL_SOCKET_TIMEOUT, 0, &g->still_running); - mcode_or_die("multi_timer_cb: curl_multi_socket_action", rc); - } - else if(timeout_ms == -1) + if(timeout_ms == -1) evtimer_del(&g->timer_event); - else + else /* includes timeout zero */ evtimer_add(&g->timer_event, &timeout); return 0; } |