From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id E76D43851C2C; Thu, 30 Jul 2020 13:25:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E76D43851C2C 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 timer_gettime X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: 1ed1ce0cb57d47f2ead1b48c37afc407cfcf40fc X-Git-Newrev: 6f3740e2da3aeac7bfda335a4cbd5442a3780fbe Message-Id: <20200730132511.E76D43851C2C@sourceware.org> Date: Thu, 30 Jul 2020 13:25:11 +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:25:12 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6f3740e2da3aeac7bfda335a4cbd5442a3780fbe commit 6f3740e2da3aeac7bfda335a4cbd5442a3780fbe Author: Adhemerval Zanella Date: Fri Jul 10 15:05:51 2020 -0300 linux: Simplify timer_gettime With arch-syscall.h it can now assumes the existance of either __NR_timer_gettime or __NR_time_gettime_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/timer_gettime.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sysdeps/unix/sysv/linux/timer_gettime.c b/sysdeps/unix/sysv/linux/timer_gettime.c index 1e07d4845b..5d31c7c864 100644 --- a/sysdeps/unix/sysv/linux/timer_gettime.c +++ b/sysdeps/unix/sysv/linux/timer_gettime.c @@ -28,27 +28,23 @@ __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value) { struct timer *kt = (struct timer *) timerid; -#ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_timer_gettime64 -# define __NR_timer_gettime64 __NR_timer_gettime -# endif - return INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid, value); -#else -# ifdef __NR_timer_gettime64 +#ifndef __NR_timer_gettime64 +# define __NR_timer_gettime64 __NR_timer_gettime +#endif int ret = INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid, value); +#ifndef __ASSUME_TIME64_SYSCALLS if (ret == 0 || errno != ENOSYS) return ret; -# endif + struct itimerspec its32; - int retval = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid, &its32); - if (retval == 0) + ret = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid, &its32); + if (ret == 0) { value->it_interval = valid_timespec_to_timespec64 (its32.it_interval); value->it_value = valid_timespec_to_timespec64 (its32.it_value); } - - return retval; #endif + return ret; } #if __TIMESIZE != 64