From: Alistair Francis <alistair23@gmail.com>
To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: GNU C Library <libc-alpha@sourceware.org>
Subject: Re: [PATCH v2 01/14] linux: Simplify clock_getres
Date: Thu, 10 Sep 2020 12:20:29 -0700 [thread overview]
Message-ID: <CAKmqyKOCrctsQx6Z8D3sfhJtK7wJM_cojF80uvtrEoe8upOkBQ@mail.gmail.com> (raw)
In-Reply-To: <20200908145738.640039-1-adhemerval.zanella@linaro.org>
On Tue, Sep 8, 2020 at 7:57 AM Adhemerval Zanella via Libc-alpha
<libc-alpha@sourceware.org> wrote:
>
> With arch-syscall.h it can now assumes the existance of either
> __NR_clock_getres or __NR_clock_getres_time64. The 32-bit time_t
> support is now only build for !__ASSUME_TIME64_SYSCALLS.
>
> It also uses the time64-support functions to simplify it further.
>
> Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15
> kernel).
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> sysdeps/unix/sysv/linux/clock_getres.c | 38 ++++++++++----------------
> 1 file changed, 15 insertions(+), 23 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/clock_getres.c b/sysdeps/unix/sysv/linux/clock_getres.c
> index 5f6955ab10..6be73c94de 100644
> --- a/sysdeps/unix/sysv/linux/clock_getres.c
> +++ b/sysdeps/unix/sysv/linux/clock_getres.c
> @@ -21,6 +21,7 @@
> #include <time.h>
>
> #include <sysdep-vdso.h>
> +#include <time64-support.h>
> #include <shlib-compat.h>
> #include <kernel-features.h>
>
> @@ -28,36 +29,26 @@
> int
> __clock_getres64 (clockid_t clock_id, struct __timespec64 *res)
> {
> -#ifdef __ASSUME_TIME64_SYSCALLS
> - /* 64 bit ABIs or Newer 32-bit ABIs that only support 64-bit time_t. */
> -# ifndef __NR_clock_getres_time64
> -# define __NR_clock_getres_time64 __NR_clock_getres
> -# endif
> -# ifdef HAVE_CLOCK_GETRES64_VSYSCALL
> - return INLINE_VSYSCALL (clock_getres_time64, 2, clock_id, res);
> -# else
> - return INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res);
> -# endif
> -#else
> int r;
> - /* Old 32-bit ABI with possible 64-bit time_t support. */
> -# ifdef __NR_clock_getres_time64
> - /* Avoid issue a __NR_clock_getres_time64 syscall on kernels that do not
> - support 64-bit time_t. */
> - static int time64_support = 1;
> - if (atomic_load_relaxed (&time64_support) != 0)
> +
> +#ifndef __NR_clock_getres_time64
> +# define __NR_clock_getres_time64 __NR_clock_getres
> +#endif
> + if (supports_time64 ())
> {
> -# ifdef HAVE_CLOCK_GETRES64_VSYSCALL
> +#ifdef HAVE_CLOCK_GETRES64_VSYSCALL
> r = INLINE_VSYSCALL (clock_getres_time64, 2, clock_id, res);
> -# else
> +#else
> r = INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res);
> -# endif
> +#endif
> +
> if (r == 0 || errno != ENOSYS)
> return r;
>
> - atomic_store_relaxed (&time64_support, 0);
> + mark_time64_unsupported ();
> }
> -# endif
> +
> +#ifndef __ASSUME_TIME64_SYSCALLS
> /* Fallback code that uses 32-bit support. */
> struct timespec ts32;
> # ifdef HAVE_CLOCK_GETRES_VSYSCALL
> @@ -67,8 +58,9 @@ __clock_getres64 (clockid_t clock_id, struct __timespec64 *res)
> # endif
> if (r == 0)
> *res = valid_timespec_to_timespec64 (ts32);
> - return r;
> #endif
> +
> + return r;
> }
>
> #if __TIMESIZE != 64
> --
> 2.25.1
>
prev parent reply other threads:[~2020-09-10 19:31 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-08 14:57 Adhemerval Zanella
2020-09-08 14:57 ` [PATCH v2 02/14] linux: Add ppoll time64 optimization Adhemerval Zanella
2020-09-10 19:21 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 03/14] linux: Add time64 semtimedop support Adhemerval Zanella
2020-09-10 19:23 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 04/14] linux: Add time64 pselect support Adhemerval Zanella
2020-09-10 19:35 ` Alistair Francis
2020-09-12 1:22 ` H.J. Lu
2020-09-08 14:57 ` [PATCH v2 05/14] linux: Add time64 select support Adhemerval Zanella
2020-09-11 20:44 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 06/14] linux: Add time64 sigtimedwait support Adhemerval Zanella
2020-09-11 20:56 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 07/14] linux: Use 64-bit time_t syscall on clock_getcputclockid Adhemerval Zanella
2020-09-16 15:26 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 08/14] linux: Consolidate utimes Adhemerval Zanella
2020-09-16 15:30 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 09/14] linux: Fix time64 support for futimesat Adhemerval Zanella
2020-09-08 14:57 ` [PATCH v2 10/14] linux: Add time64 support for nanosleep Adhemerval Zanella
2020-09-16 17:16 ` Alistair Francis
2020-09-08 14:57 ` [PATCH v2 11/14] linux: Add time64 recvmmsg support Adhemerval Zanella
2020-09-25 21:18 ` Alistair Francis
2020-09-08 14:57 ` [RFC 12/14] linux: Add fallback for 64-bit time_t SO_{RCV,SND}TIMEO Adhemerval Zanella
2020-09-08 14:57 ` [RFC 13/14] linux: Add fallback for 64-bit time_t SO_TIMESTAMP{NS} Adhemerval Zanella
2020-09-08 14:57 ` [RFC 14/14] linux: Add recvvmsg " Adhemerval Zanella
2020-09-10 19:20 ` Alistair Francis [this message]
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=CAKmqyKOCrctsQx6Z8D3sfhJtK7wJM_cojF80uvtrEoe8upOkBQ@mail.gmail.com \
--to=alistair23@gmail.com \
--cc=adhemerval.zanella@linaro.org \
--cc=libc-alpha@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: link
Be 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).