From 0f39807d206644c25d1c5cfcbfc04f51cc965b41 Mon Sep 17 00:00:00 2001 From: Livius Date: Thu, 23 Sep 2021 00:40:55 +0200 Subject: [PATCH 1/5] replace select() to nanosleep() Replace outdated select() to use nanosleep() for sleep implementation in Unix --- Modules/_multiprocessing/semaphore.c | 22 +++++++++++----------- Modules/_tkinter.c | 7 +++---- Modules/timemodule.c | 6 +++--- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c index 9a2d1f85c92fa2..66cfef27620d96 100644 --- a/Modules/_multiprocessing/semaphore.c +++ b/Modules/_multiprocessing/semaphore.c @@ -235,11 +235,11 @@ sem_timedwait_save(sem_t *sem, struct timespec *deadline, PyThreadState *_save) { int res; unsigned long delay, difference; - struct timeval now, tvdeadline, tvdelay; + struct timespec tsdeadline, tsdelay; + struct timeval now; errno = 0; - tvdeadline.tv_sec = deadline->tv_sec; - tvdeadline.tv_usec = deadline->tv_nsec / 1000; + tsdeadline = *deadline; for (delay = 0 ; ; delay += 1000) { /* poll */ @@ -253,16 +253,16 @@ sem_timedwait_save(sem_t *sem, struct timespec *deadline, PyThreadState *_save) return MP_STANDARD_ERROR; /* check for timeout */ - if (tvdeadline.tv_sec < now.tv_sec || - (tvdeadline.tv_sec == now.tv_sec && - tvdeadline.tv_usec <= now.tv_usec)) { + if (tsdeadline.tv_sec < now.tv_sec || + (tsdeadline.tv_sec == now.tv_sec && + tsdeadline.tv_nsec <= (now.tv_usec*1000))) { errno = ETIMEDOUT; return MP_STANDARD_ERROR; } /* calculate how much time is left */ - difference = (tvdeadline.tv_sec - now.tv_sec) * 1000000 + - (tvdeadline.tv_usec - now.tv_usec); + difference = (tsdeadline.tv_sec - now.tv_sec) * 1000000 + + ((tsdeadline.tv_nsec/1000) - now.tv_usec); /* check delay not too long -- maximum is 20 msecs */ if (delay > 20000) @@ -271,9 +271,9 @@ sem_timedwait_save(sem_t *sem, struct timespec *deadline, PyThreadState *_save) delay = difference; /* sleep */ - tvdelay.tv_sec = delay / 1000000; - tvdelay.tv_usec = delay % 1000000; - if (select(0, NULL, NULL, NULL, &tvdelay) < 0) + tsdelay.tv_sec = delay / 1000000; + tsdelay.tv_nsec = (delay % 1000000) * 1000; + if (nanosleep(&tsdelay, NULL) < 0) return MP_STANDARD_ERROR; /* check for signals */ diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index 7be9b8c0385b97..baa0ed41487110 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -357,11 +357,10 @@ static int Tkinter_busywaitinterval = 20; static void Sleep(int milli) { - /* XXX Too bad if you don't have select(). */ - struct timeval t; + struct timespec t; t.tv_sec = milli/1000; - t.tv_usec = (milli%1000) * 1000; - select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &t); + t.tv_nsec = (milli%1000) * 1000000; + nanosleep(&t, NULL); } #endif /* MS_WINDOWS */ diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 53ec86eb3981ef..4a48693eaa3e5a 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -2058,7 +2058,7 @@ pysleep(_PyTime_t secs) #ifdef HAVE_CLOCK_NANOSLEEP struct timespec timeout_abs; #else - struct timeval timeout; + struct timespec timeout; #endif _PyTime_t deadline, monotonic; int err = 0; @@ -2075,7 +2075,7 @@ pysleep(_PyTime_t secs) do { #ifndef HAVE_CLOCK_NANOSLEEP - if (_PyTime_AsTimeval(secs, &timeout, _PyTime_ROUND_CEILING) < 0) { + if (_PyTime_AsTimespec(secs, &timeout) < 0) { return -1; } #endif @@ -2088,7 +2088,7 @@ pysleep(_PyTime_t secs) err = ret; #else Py_BEGIN_ALLOW_THREADS - ret = select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &timeout); + ret = nanosleep(&timeout, NULL); Py_END_ALLOW_THREADS err = errno; #endif From 955a47f43bc94c454db6045485ebdba02f2fcc31 Mon Sep 17 00:00:00 2001 From: "blurb-it[bot]" <43283697+blurb-it[bot]@users.noreply.github.com> Date: Wed, 22 Sep 2021 23:56:16 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=93=9C=F0=9F=A4=96=20Added=20by=20blu?= =?UTF-8?q?rb=5Fit.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NEWS.d/next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst diff --git a/Misc/NEWS.d/next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst b/Misc/NEWS.d/next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst new file mode 100644 index 00000000000000..c050fd8a3cd0d0 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst @@ -0,0 +1 @@ +In Unix operating systems, :func:`time.sleep` now uses the ``nanosleep()`` function, if ``clock_nanosleep()`` is not available. ``nanosleep()`` allows to sleep with nanosecond precision. \ No newline at end of file From 3e2bb518a1082fabf599ff8eee68dd3391a7f7d1 Mon Sep 17 00:00:00 2001 From: Livius Date: Thu, 23 Sep 2021 22:02:37 +0200 Subject: [PATCH 3/5] revert some changes --- Modules/_multiprocessing/semaphore.c | 22 +++++++++++----------- Modules/_tkinter.c | 7 ++++--- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/Modules/_multiprocessing/semaphore.c b/Modules/_multiprocessing/semaphore.c index 66cfef27620d96..9a2d1f85c92fa2 100644 --- a/Modules/_multiprocessing/semaphore.c +++ b/Modules/_multiprocessing/semaphore.c @@ -235,11 +235,11 @@ sem_timedwait_save(sem_t *sem, struct timespec *deadline, PyThreadState *_save) { int res; unsigned long delay, difference; - struct timespec tsdeadline, tsdelay; - struct timeval now; + struct timeval now, tvdeadline, tvdelay; errno = 0; - tsdeadline = *deadline; + tvdeadline.tv_sec = deadline->tv_sec; + tvdeadline.tv_usec = deadline->tv_nsec / 1000; for (delay = 0 ; ; delay += 1000) { /* poll */ @@ -253,16 +253,16 @@ sem_timedwait_save(sem_t *sem, struct timespec *deadline, PyThreadState *_save) return MP_STANDARD_ERROR; /* check for timeout */ - if (tsdeadline.tv_sec < now.tv_sec || - (tsdeadline.tv_sec == now.tv_sec && - tsdeadline.tv_nsec <= (now.tv_usec*1000))) { + if (tvdeadline.tv_sec < now.tv_sec || + (tvdeadline.tv_sec == now.tv_sec && + tvdeadline.tv_usec <= now.tv_usec)) { errno = ETIMEDOUT; return MP_STANDARD_ERROR; } /* calculate how much time is left */ - difference = (tsdeadline.tv_sec - now.tv_sec) * 1000000 + - ((tsdeadline.tv_nsec/1000) - now.tv_usec); + difference = (tvdeadline.tv_sec - now.tv_sec) * 1000000 + + (tvdeadline.tv_usec - now.tv_usec); /* check delay not too long -- maximum is 20 msecs */ if (delay > 20000) @@ -271,9 +271,9 @@ sem_timedwait_save(sem_t *sem, struct timespec *deadline, PyThreadState *_save) delay = difference; /* sleep */ - tsdelay.tv_sec = delay / 1000000; - tsdelay.tv_nsec = (delay % 1000000) * 1000; - if (nanosleep(&tsdelay, NULL) < 0) + tvdelay.tv_sec = delay / 1000000; + tvdelay.tv_usec = delay % 1000000; + if (select(0, NULL, NULL, NULL, &tvdelay) < 0) return MP_STANDARD_ERROR; /* check for signals */ diff --git a/Modules/_tkinter.c b/Modules/_tkinter.c index baa0ed41487110..7be9b8c0385b97 100644 --- a/Modules/_tkinter.c +++ b/Modules/_tkinter.c @@ -357,10 +357,11 @@ static int Tkinter_busywaitinterval = 20; static void Sleep(int milli) { - struct timespec t; + /* XXX Too bad if you don't have select(). */ + struct timeval t; t.tv_sec = milli/1000; - t.tv_nsec = (milli%1000) * 1000000; - nanosleep(&t, NULL); + t.tv_usec = (milli%1000) * 1000; + select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &t); } #endif /* MS_WINDOWS */ From 75fcb70d417ab2765b9cefb649dd665ca89ba098 Mon Sep 17 00:00:00 2001 From: Livius Date: Thu, 23 Sep 2021 22:39:37 +0200 Subject: [PATCH 4/5] Add HAVE_NANOSLEEP to configure.ac --- Modules/timemodule.c | 14 +++++++++-- configure | 58 ++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 6 +++++ pyconfig.h.in | 3 +++ 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/Modules/timemodule.c b/Modules/timemodule.c index 4a48693eaa3e5a..aaf96e3f938682 100644 --- a/Modules/timemodule.c +++ b/Modules/timemodule.c @@ -2057,8 +2057,10 @@ pysleep(_PyTime_t secs) #ifndef MS_WINDOWS #ifdef HAVE_CLOCK_NANOSLEEP struct timespec timeout_abs; -#else +#elif defined(HAVE_NANOSLEEP) struct timespec timeout; +#else + struct timeval timeout; #endif _PyTime_t deadline, monotonic; int err = 0; @@ -2074,10 +2076,14 @@ pysleep(_PyTime_t secs) #endif do { -#ifndef HAVE_CLOCK_NANOSLEEP +#if defined(HAVE_NANOSLEEP) && !defined(HAVE_CLOCK_NANOSLEEP) if (_PyTime_AsTimespec(secs, &timeout) < 0) { return -1; } +#elif !defined(HAVE_CLOCK_NANOSLEEP) + if (_PyTime_AsTimeval(secs, &timeout, _PyTime_ROUND_CEILING) < 0) { + return -1; + } #endif int ret; @@ -2088,7 +2094,11 @@ pysleep(_PyTime_t secs) err = ret; #else Py_BEGIN_ALLOW_THREADS +#ifdef HAVE_NANOSLEEP ret = nanosleep(&timeout, NULL); +#else + ret = select(0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &timeout); +#endif Py_END_ALLOW_THREADS err = errno; #endif diff --git a/configure b/configure index 2e3c9ba7baddd4..4acf91f22107f4 100755 --- a/configure +++ b/configure @@ -13310,6 +13310,64 @@ fi done +for ac_func in nanosleep +do : + ac_fn_c_check_func "$LINENO" "nanosleep" "ac_cv_func_nanosleep" +if test "x$ac_cv_func_nanosleep" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_NANOSLEEP 1 +_ACEOF + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nanosleep in -lrt" >&5 +$as_echo_n "checking for nanosleep in -lrt... " >&6; } +if ${ac_cv_lib_rt_nanosleep+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lrt $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char nanosleep (); +int +main () +{ +return nanosleep (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_rt_nanosleep=yes +else + ac_cv_lib_rt_nanosleep=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_nanosleep" >&5 +$as_echo "$ac_cv_lib_rt_nanosleep" >&6; } +if test "x$ac_cv_lib_rt_nanosleep" = xyes; then : + + $as_echo "#define HAVE_NANOSLEEP 1" >>confdefs.h + + +fi + + +fi +done + + for ac_func in clock_getres do : ac_fn_c_check_func "$LINENO" "clock_getres" "ac_cv_func_clock_getres" diff --git a/configure.ac b/configure.ac index 4a0694c442f3f7..48d86ef79199e1 100644 --- a/configure.ac +++ b/configure.ac @@ -4121,6 +4121,12 @@ AC_CHECK_FUNCS(clock_nanosleep, [], [ ]) ]) +AC_CHECK_FUNCS(nanosleep, [], [ + AC_CHECK_LIB(rt, nanosleep, [ + AC_DEFINE(HAVE_NANOSLEEP, 1) + ]) +]) + AC_MSG_CHECKING(for major, minor, and makedev) AC_LINK_IFELSE([AC_LANG_PROGRAM([[ #if defined(MAJOR_IN_MKDEV) diff --git a/pyconfig.h.in b/pyconfig.h.in index d6408e9415e2d0..23d7111b9f77e7 100644 --- a/pyconfig.h.in +++ b/pyconfig.h.in @@ -736,6 +736,9 @@ /* Define to 1 if you have the `mremap' function. */ #undef HAVE_MREMAP +/* Define to 1 if you have the `nanosleep' function. */ +#undef HAVE_NANOSLEEP + /* Define to 1 if you have the header file. */ #undef HAVE_NCURSES_H From 03659cb22627c8c4b406f70d5b14e6e1c5d06f75 Mon Sep 17 00:00:00 2001 From: Livius Date: Thu, 23 Sep 2021 22:41:48 +0200 Subject: [PATCH 5/5] Update news rst --- .../next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Misc/NEWS.d/next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst b/Misc/NEWS.d/next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst index c050fd8a3cd0d0..52ee8d7cc64f15 100644 --- a/Misc/NEWS.d/next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst +++ b/Misc/NEWS.d/next/Library/2021-09-22-23-56-15.bpo-21302.vvQ3Su.rst @@ -1 +1 @@ -In Unix operating systems, :func:`time.sleep` now uses the ``nanosleep()`` function, if ``clock_nanosleep()`` is not available. ``nanosleep()`` allows to sleep with nanosecond precision. \ No newline at end of file +In Unix operating systems, :func:`time.sleep` now uses the ``nanosleep()`` function, if ``clock_nanosleep()`` is not available but ``nanosleep()`` is available. ``nanosleep()`` allows to sleep with nanosecond precision. \ No newline at end of file