From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id C95D33840C2C; Thu, 30 Jul 2020 13:26:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C95D33840C2C 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: Use 64-bit time_t syscall on clock_getcputclockid X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/y2038 X-Git-Oldrev: 4a97da49eab2e78b7d764a6ba86ebbe550443479 X-Git-Newrev: ad0e2ca2fabcc96579a7971eadf6c9fee1ef8a71 Message-Id: <20200730132607.C95D33840C2C@sourceware.org> Date: Thu, 30 Jul 2020 13:26:07 +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:26:07 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ad0e2ca2fabcc96579a7971eadf6c9fee1ef8a71 commit ad0e2ca2fabcc96579a7971eadf6c9fee1ef8a71 Author: Adhemerval Zanella Date: Tue Jul 7 17:25:00 2020 -0300 linux: Use 64-bit time_t syscall on clock_getcputclockid The syscall __NR_clock_getres_time64 (for 32-bit) or __NR_clock_getres (for 64-bit) is used as default. The 32-bit fallback is used iff __ASSUME_TIME64_SYSCALLS is not defined, which assumes the kernel ABI provides either __NR_rt_sigtimedwait (32-bit time_t). Since the symbol does not use any type which might be affected by the time_t, there is no need to add a 64-bit variant. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Diff: --- sysdeps/unix/sysv/linux/clock_getcpuclockid.c | 37 +++++++++++++++++---------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c index be1f477187..3c3bdd42ed 100644 --- a/sysdeps/unix/sysv/linux/clock_getcpuclockid.c +++ b/sysdeps/unix/sysv/linux/clock_getcpuclockid.c @@ -22,6 +22,20 @@ #include "kernel-posix-cpu-timers.h" #include +static int +clock_getcpuclockid_return (int r, clockid_t pidclock, clockid_t *clock_id) +{ + if (r == 0) + { + *clock_id = pidclock; + return 0; + } + if (r == -EINVAL) + /* The clock_getres system call checked the PID for us. */ + return ESRCH; + return -r; +} + int __clock_getcpuclockid (pid_t pid, clockid_t *clock_id) { @@ -30,20 +44,17 @@ __clock_getcpuclockid (pid_t pid, clockid_t *clock_id) const clockid_t pidclock = MAKE_PROCESS_CPUCLOCK (pid, CPUCLOCK_SCHED); - int r = INTERNAL_SYSCALL_CALL (clock_getres, pidclock, NULL); - if (!INTERNAL_SYSCALL_ERROR_P (r)) - { - *clock_id = pidclock; - return 0; - } +#ifndef __NR_clock_getres_time64 +# define __NR_clock_getres_time64 __NR_clock_getres +#endif + int r = INTERNAL_SYSCALL_CALL (clock_getres_time64, pidclock, NULL); +#ifndef __ASSUME_TIME64_SYSCALLS + if (r == 0 && r != -ENOSYS) + return clock_getcpuclockid_return (r, pidclock, clock_id); - if (INTERNAL_SYSCALL_ERRNO (r) == EINVAL) - { - /* The clock_getres system call checked the PID for us. */ - return ESRCH; - } - else - return INTERNAL_SYSCALL_ERRNO (r); + r = INTERNAL_SYSCALL_CALL (clock_getres, pidclock, NULL); +#endif + return clock_getcpuclockid_return (r, pidclock, clock_id); } versioned_symbol (libc, __clock_getcpuclockid, clock_getcpuclockid, GLIBC_2_17);