diff options
author | Daniel Stenberg <daniel@haxx.se> | 2020-01-23 13:39:27 +0100 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2020-01-26 18:27:18 +0100 |
commit | 1ad49feb71418f26aa6114c7a20ce1463beb3ea9 (patch) | |
tree | cb72ace04016e81eb1e62d81fe1b4ce0ee13dfda /lib/select.h | |
parent | 34e6bc42b0650c48504a286020dcda85180e05e2 (diff) | |
download | curl-1ad49feb71418f26aa6114c7a20ce1463beb3ea9.tar.gz |
global_init: assume the EINTR bit by default
- Removed from global_init since it isn't thread-safe. The symbol will
still remain to not break compiles, it just won't have any effect going
forward.
- make the internals NOT loop on EINTR (the opposite from previously).
It only risks returning from the select/poll/wait functions early, and that
should be risk-free.
Closes #4840
Diffstat (limited to 'lib/select.h')
-rw-r--r-- | lib/select.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/select.h b/lib/select.h index 687ab164c..ec3021aac 100644 --- a/lib/select.h +++ b/lib/select.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al. + * Copyright (C) 1998 - 2020, 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 @@ -75,20 +75,12 @@ struct pollfd int Curl_socket_check(curl_socket_t readfd, curl_socket_t readfd2, curl_socket_t writefd, time_t timeout_ms); - #define SOCKET_READABLE(x,z) \ Curl_socket_check(x, CURL_SOCKET_BAD, CURL_SOCKET_BAD, (time_t)z) #define SOCKET_WRITABLE(x,z) \ Curl_socket_check(CURL_SOCKET_BAD, CURL_SOCKET_BAD, x, (time_t)z) int Curl_poll(struct pollfd ufds[], unsigned int nfds, int timeout_ms); - -/* On non-DOS and non-Winsock platforms, when Curl_ack_eintr is set, - * EINTR condition is honored and function might exit early without - * awaiting full timeout. Otherwise EINTR will be ignored and full - * timeout will elapse. */ -extern int Curl_ack_eintr; - int Curl_wait_ms(int timeout_ms); #ifdef TPF |