From 648b2e9209d5da04aff5f8a24aed1cd03a110f8d Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Mon, 11 May 2026 10:42:26 +0000 Subject: Rename sysdep to selectinfinite, find correct test value for timeout --- src/libstddjb/iopause_select.c | 4 ++-- src/sysdeps/tryselectinfinite.c | 42 +++++++++++++++++++++++++++++++++++++ src/sysdeps/tryselectshorttimeout.c | 41 ------------------------------------ 3 files changed, 44 insertions(+), 43 deletions(-) create mode 100644 src/sysdeps/tryselectinfinite.c delete mode 100644 src/sysdeps/tryselectshorttimeout.c (limited to 'src') diff --git a/src/libstddjb/iopause_select.c b/src/libstddjb/iopause_select.c index 863bea7..45ce19e 100644 --- a/src/libstddjb/iopause_select.c +++ b/src/libstddjb/iopause_select.c @@ -30,10 +30,10 @@ int iopause_select (iopause_fd *x, unsigned int len, tain const *deadline, tain if (errno != EOVERFLOW) return -1 ; else deadline = 0 ; } -#ifdef SKALIBS_HASSELECTSHORTTIMEOUT +#ifndef SKALIBS_HASSELECTINFINITE if (deadline && tv.tv_sec >= 100000000) { - tv.tv_sec = 99999999 ; + tv.tv_sec = 100000000 ; tv.tv_usec = 0 ; } #endif diff --git a/src/sysdeps/tryselectinfinite.c b/src/sysdeps/tryselectinfinite.c new file mode 100644 index 0000000..83b2c06 --- /dev/null +++ b/src/sysdeps/tryselectinfinite.c @@ -0,0 +1,42 @@ +/* ISC license. */ + +#undef _POSIX_C_SOURCE +#undef _XOPEN_SOURCE + +#ifndef _BSD_SOURCE +#define _BSD_SOURCE +#endif +#ifndef _NETBSD_SOURCE +#define _NETBSD_SOURCE +#endif +#ifndef _DARWIN_C_SOURCE +#define _DARWIN_C_SOURCE +#endif + +#include +#include +#include +#include +#include +#include + +static void alrm_handler (int sig) +{ + (void)sig ; + _exit(0) ; +} + +int main (void) +{ + struct sigaction action = { .sa_handler = &alrm_handler, .sa_flags = SA_NOCLDSTOP } ; + struct timeval tv = { .tv_sec = 100000001, .tv_usec = 0 } ; + fd_set r, w, x ; + FD_ZERO(&r) ; + FD_ZERO(&w) ; + FD_ZERO(&x) ; + sigfillset(&action.sa_mask) ; + if (sigaction(SIGALRM, &action, 0) == -1) _exit(111) ; + alarm(1) ; + select(1, &r, &w, &x, &tv) ; + _exit(errno == EINVAL ? 1 : 111) ; +} diff --git a/src/sysdeps/tryselectshorttimeout.c b/src/sysdeps/tryselectshorttimeout.c deleted file mode 100644 index 9049079..0000000 --- a/src/sysdeps/tryselectshorttimeout.c +++ /dev/null @@ -1,41 +0,0 @@ -/* ISC license. */ - -#undef _POSIX_C_SOURCE -#undef _XOPEN_SOURCE - -#ifndef _BSD_SOURCE -#define _BSD_SOURCE -#endif -#ifndef _NETBSD_SOURCE -#define _NETBSD_SOURCE -#endif -#ifndef _DARWIN_C_SOURCE -#define _DARWIN_C_SOURCE -#endif - -#include -#include -#include -#include -#include - -static void alrm_handler (int sig) -{ - (void)sig ; - _exit(1) ; -} - -int main (void) -{ - struct sigaction action = { .sa_handler = &alrm_handler, .sa_flags = SA_NOCLDSTOP | SA_RESTART } ; - struct timeval tv = { .tv_sec = 100000000, .tv_usec = 0 } ; - fd_set r, w, x ; - FD_ZERO(&r) ; - FD_ZERO(&w) ; - FD_ZERO(&x) ; - sigfillset(&action.sa_mask) ; - if (sigaction(SIGALRM, &action, 0) == -1) _exit(111) ; - alarm(1) ; - if (select(1, &r, &w, &x, &tv) == -1) _exit(errno == EINVAL ? 0 : 111) ; - _exit(1) ; -} -- cgit v1.3.1