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] linux: Simplify timer_gettime Date: Mon, 24 Aug 2020 18:33:59 +0000 (GMT) [thread overview] Message-ID: <20200824183359.0CC44386F414@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=70746a06c2de7c8183a94379437779991d35266d commit 70746a06c2de7c8183a94379437779991d35266d Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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). Reviewed-by: Lukasz Majewski <lukma@denx.de> 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
reply other threads:[~2020-08-24 18:33 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=20200824183359.0CC44386F414@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).