public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] linux: Use 64-bit time_t syscall on clock_getcputclockid Date: Thu, 30 Jul 2020 13:26:07 +0000 (GMT) [thread overview] Message-ID: <20200730132607.C95D33840C2C@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=ad0e2ca2fabcc96579a7971eadf6c9fee1ef8a71 commit ad0e2ca2fabcc96579a7971eadf6c9fee1ef8a71 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 <shlib-compat.h> +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);
reply other threads:[~2020-07-30 13:26 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200730132607.C95D33840C2C@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).