eventfd: allow for all CPUs

After fixing support for x32, unlock eventfd support for all CPUs.
Before this patch, it was explicitly limited to 64-bit ones.

You can disable eventfs manually on systems where it's auto-detected:
- cmake: `-DHAVE_EVENTFD=0`
- configure: `export ac_cv_func_eventfd=0`

Ref: c2aa504ab9 #16239
Closes #16277
This commit is contained in:
Viktor Szakats 2025-02-08 02:34:48 +01:00
parent bf823397ba
commit 4d01de3529
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
4 changed files with 8 additions and 25 deletions

View File

@ -170,7 +170,7 @@ void destroy_thread_sync_data(struct thread_sync_data *tsd)
* close one end of the socket pair (may be done in resolver thread); * close one end of the socket pair (may be done in resolver thread);
* the other end (for reading) is always closed in the parent thread. * the other end (for reading) is always closed in the parent thread.
*/ */
#ifndef USE_EVENTFD #ifndef HAVE_EVENTFD
if(tsd->sock_pair[1] != CURL_SOCKET_BAD) { if(tsd->sock_pair[1] != CURL_SOCKET_BAD) {
wakeup_close(tsd->sock_pair[1]); wakeup_close(tsd->sock_pair[1]);
} }
@ -293,7 +293,7 @@ CURL_STDCALL getaddrinfo_thread(void *arg)
else { else {
#ifndef CURL_DISABLE_SOCKETPAIR #ifndef CURL_DISABLE_SOCKETPAIR
if(tsd->sock_pair[1] != CURL_SOCKET_BAD) { if(tsd->sock_pair[1] != CURL_SOCKET_BAD) {
#ifdef USE_EVENTFD #ifdef HAVE_EVENTFD
const uint64_t buf[1] = { 1 }; const uint64_t buf[1] = { 1 };
#else #else
const char buf[1] = { 1 }; const char buf[1] = { 1 };

View File

@ -1552,7 +1552,7 @@ CURLMcode curl_multi_wakeup(CURLM *m)
and before cleanup */ and before cleanup */
if(multi->wakeup_pair[1] != CURL_SOCKET_BAD) { if(multi->wakeup_pair[1] != CURL_SOCKET_BAD) {
while(1) { while(1) {
#ifdef USE_EVENTFD #ifdef HAVE_EVENTFD
/* eventfd has a stringent rule of requiring the 8-byte buffer when /* eventfd has a stringent rule of requiring the 8-byte buffer when
calling write(2) on it */ calling write(2) on it */
const uint64_t buf[1] = { 1 }; const uint64_t buf[1] = { 1 };
@ -2873,7 +2873,7 @@ CURLMcode curl_multi_cleanup(CURLM *m)
#else #else
#ifdef ENABLE_WAKEUP #ifdef ENABLE_WAKEUP
wakeup_close(multi->wakeup_pair[0]); wakeup_close(multi->wakeup_pair[0]);
#ifndef USE_EVENTFD #ifndef HAVE_EVENTFD
wakeup_close(multi->wakeup_pair[1]); wakeup_close(multi->wakeup_pair[1]);
#endif #endif
#endif #endif

View File

@ -27,7 +27,7 @@
#include "urldata.h" #include "urldata.h"
#include "rand.h" #include "rand.h"
#if defined(USE_EVENTFD) #ifdef HAVE_EVENTFD
#ifdef HAVE_SYS_EVENTFD_H #ifdef HAVE_SYS_EVENTFD_H
#include <sys/eventfd.h> #include <sys/eventfd.h>
#endif #endif

View File

@ -26,24 +26,7 @@
#include "curl_setup.h" #include "curl_setup.h"
#if defined(HAVE_EVENTFD) && \ #ifdef HAVE_EVENTFD
(defined(__x86_64__) || \
defined(__aarch64__) || \
defined(__ia64__) || \
defined(__ppc64__) || \
defined(__mips64) || \
defined(__sparc64__) || \
defined(__riscv_64e) || \
defined(__s390x__))
/* Use eventfd only with 64-bit CPU architectures because eventfd has a
* stringent rule of requiring the 8-byte buffer when calling read(2) and
* write(2) on it. In some rare cases, the C standard library implementation
* on a 32-bit system might choose to define uint64_t as a 32-bit type for
* various reasons (memory limitations, compatibility with older code),
* which makes eventfd broken.
*/
#define USE_EVENTFD 1
#define wakeup_write write #define wakeup_write write
#define wakeup_read read #define wakeup_read read
@ -63,7 +46,7 @@ int Curl_eventfd(curl_socket_t socks[2], bool nonblocking);
#include <curl/curl.h> #include <curl/curl.h>
int Curl_pipe(curl_socket_t socks[2], bool nonblocking); int Curl_pipe(curl_socket_t socks[2], bool nonblocking);
#else /* !USE_EVENTFD && !HAVE_PIPE */ #else /* !HAVE_EVENTFD && !HAVE_PIPE */
#define wakeup_write swrite #define wakeup_write swrite
#define wakeup_read sread #define wakeup_read sread
@ -86,7 +69,7 @@ int Curl_pipe(curl_socket_t socks[2], bool nonblocking);
#define wakeup_create(p,nb)\ #define wakeup_create(p,nb)\
Curl_socketpair(SOCKETPAIR_FAMILY, SOCKETPAIR_TYPE, 0, p, nb) Curl_socketpair(SOCKETPAIR_FAMILY, SOCKETPAIR_TYPE, 0, p, nb)
#endif /* USE_EVENTFD */ #endif /* HAVE_EVENTFD */
#ifndef CURL_DISABLE_SOCKETPAIR #ifndef CURL_DISABLE_SOCKETPAIR
#include <curl/curl.h> #include <curl/curl.h>