From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 73820382EBF2; Thu, 30 Jul 2020 13:24:41 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 73820382EBF2 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] linux: Simplify clock_nanosleep X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: a702f75ac03ca5218ac2a7af37660c3084b255f2 X-Git-Newrev: 8865577d86a7a66c5e799807697f47dcd45ce5d6 Message-Id: <20200730132441.73820382EBF2@sourceware.org> Date: Thu, 30 Jul 2020 13:24:41 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 30 Jul 2020 13:24:41 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=8865577d86a7a66c5e799807697f47dcd45ce5d6 commit 8865577d86a7a66c5e799807697f47dcd45ce5d6 Author: Adhemerval Zanella Date: Fri Jul 10 09:54:35 2020 -0300 linux: Simplify clock_nanosleep With arch-syscall.h it can now assumes the existance of either __NR_clock_nanosleep or __NR_clock_nanosleep_time64. The 32-bit time_t support is now only build for !__ASSUME_TIME64_SYSCALLS. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Diff: --- sysdeps/unix/sysv/linux/clock_nanosleep.c | 33 +++++++++++-------------------- 1 file changed, 11 insertions(+), 22 deletions(-) diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c index cc7a09569d..6ad3321435 100644 --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -30,8 +30,6 @@ int __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec64 *req, struct __timespec64 *rem) { - int r; - if (clock_id == CLOCK_THREAD_CPUTIME_ID) return EINVAL; if (clock_id == CLOCK_PROCESS_CPUTIME_ID) @@ -39,22 +37,15 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec /* If the call is interrupted by a signal handler or encounters an error, it returns a positive value similar to errno. */ -#ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_clock_nanosleep_time64 -# define __NR_clock_nanosleep_time64 __NR_clock_nanosleep -# endif - r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, clock_id, - flags, req, rem); -#else -# ifdef __NR_clock_nanosleep_time64 - r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, clock_id, - flags, req, rem); - - if (! INTERNAL_SYSCALL_ERROR_P (r)) - return 0; - if (INTERNAL_SYSCALL_ERRNO (r) != ENOSYS) - return INTERNAL_SYSCALL_ERRNO (r); -# endif /* __NR_clock_nanosleep_time64 */ +#ifndef __NR_clock_nanosleep_time64 +# define __NR_clock_nanosleep_time64 __NR_clock_nanosleep +#endif + int r = INTERNAL_SYSCALL_CANCEL (clock_nanosleep_time64, clock_id, + flags, req, rem); + +#ifndef __ASSUME_TIME64_SYSCALLS + if (r == 0 || r != -ENOSYS) + return -r; if (! in_time_t_range (req->tv_sec)) { @@ -68,14 +59,12 @@ __clock_nanosleep_time64 (clockid_t clock_id, int flags, const struct __timespec &ts32, &tr32); if (INTERNAL_SYSCALL_ERROR_P (r)) { - if (INTERNAL_SYSCALL_ERRNO (r) == EINTR && rem != NULL - && (flags & TIMER_ABSTIME) == 0) + if (r == -EINTR && rem != NULL && (flags & TIMER_ABSTIME) == 0) *rem = valid_timespec_to_timespec64 (tr32); } #endif /* __ASSUME_TIME64_SYSCALLS */ - return (INTERNAL_SYSCALL_ERROR_P (r) - ? INTERNAL_SYSCALL_ERRNO (r) : 0); + return -r; } #if __TIMESIZE != 64