From 3537ecb49cf7177274607004c562d6f9ecc99474 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Tue, 5 Nov 2019 21:37:44 +0000 Subject: Refactor nanosleep in terms of clock_nanosleep The generic version is straightforward. For Hurd, its nanosleep implementation is moved to clock_nanosleep with adjustments from generic unix implementation. The generic clock_nanosleep unix version is also removed since it calls nanosleep. Checked on x86_64-linux-gnu and powerpc64le-linux-gnu. Reviewed-by: Florian Weimer --- sysdeps/unix/clock_nanosleep.c | 86 ------------------------------- sysdeps/unix/sysv/linux/clock_nanosleep.c | 2 +- sysdeps/unix/sysv/linux/nanosleep.c | 31 ----------- 3 files changed, 1 insertion(+), 118 deletions(-) delete mode 100644 sysdeps/unix/clock_nanosleep.c delete mode 100644 sysdeps/unix/sysv/linux/nanosleep.c (limited to 'sysdeps/unix') diff --git a/sysdeps/unix/clock_nanosleep.c b/sysdeps/unix/clock_nanosleep.c deleted file mode 100644 index 8514a439ee..0000000000 --- a/sysdeps/unix/clock_nanosleep.c +++ /dev/null @@ -1,86 +0,0 @@ -/* High-resolution sleep with the specified clock. - Copyright (C) 2000-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include -#include -#include - -/* This implementation assumes that these is only a `nanosleep' system - call. So we have to remap all other activities. */ -int -__clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, - struct timespec *rem) -{ - struct timespec now; - - if (! valid_nanoseconds (req->tv_nsec)) - return EINVAL; - - if (clock_id == CLOCK_THREAD_CPUTIME_ID) - return EINVAL; /* POSIX specifies EINVAL for this case. */ - - if (clock_id < CLOCK_REALTIME || clock_id > CLOCK_THREAD_CPUTIME_ID) - return EINVAL; - - /* If we got an absolute time, remap it. */ - if (flags == TIMER_ABSTIME) - { - long int nsec; - long int sec; - - /* Make sure we use safe data types. */ - assert (sizeof (sec) >= sizeof (now.tv_sec)); - - /* Get the current time for this clock. */ - if (__clock_gettime (clock_id, &now) != 0) - return errno; - - /* Compute the difference. */ - nsec = req->tv_nsec - now.tv_nsec; - sec = req->tv_sec - now.tv_sec - (nsec < 0); - if (sec < 0) - /* The time has already elapsed. */ - return 0; - - now.tv_sec = sec; - now.tv_nsec = nsec + (nsec < 0 ? 1000000000 : 0); - - /* From now on this is our time. */ - req = &now; - - /* Make sure we are not modifying the struct pointed to by REM. */ - rem = NULL; - } - else if (flags != 0) - return EINVAL; - else if (clock_id != CLOCK_REALTIME) - /* Not supported. */ - return ENOTSUP; - - return __nanosleep (req, rem), 0 ? errno : 0; -} - -versioned_symbol (libc, __clock_nanosleep, clock_nanosleep, GLIBC_2_17); -/* clock_nanosleep moved to libc in version 2.17; - old binaries may expect the symbol version it had in librt. */ -#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_17) -strong_alias (__clock_nanosleep, __clock_nanosleep_2); -compat_symbol (libc, __clock_nanosleep_2, clock_nanosleep, GLIBC_2_2); -#endif diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c index 1f240b8720..f3c6fd2d5f 100644 --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -42,7 +42,7 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, return (INTERNAL_SYSCALL_ERROR_P (r, err) ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); } - +libc_hidden_def (__clock_nanosleep) versioned_symbol (libc, __clock_nanosleep, clock_nanosleep, GLIBC_2_17); /* clock_nanosleep moved to libc in version 2.17; old binaries may expect the symbol version it had in librt. */ diff --git a/sysdeps/unix/sysv/linux/nanosleep.c b/sysdeps/unix/sysv/linux/nanosleep.c deleted file mode 100644 index 6787909248..0000000000 --- a/sysdeps/unix/sysv/linux/nanosleep.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Linux nanosleep syscall implementation. - Copyright (C) 2017-2019 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#include -#include -#include - -/* Pause execution for a number of nanoseconds. */ -int -__nanosleep (const struct timespec *requested_time, - struct timespec *remaining) -{ - return SYSCALL_CANCEL (nanosleep, requested_time, remaining); -} -hidden_def (__nanosleep) -weak_alias (__nanosleep, nanosleep) -- cgit 1.4.1