This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH 3/5] timer: Decouple x86_64 specific timer_settime from generic Linux implementation
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: Lukasz Majewski <lukma at denx dot de>, Joseph Myers <joseph at codesourcery dot com>, Paul Eggert <eggert at cs dot ucla dot edu>
- Cc: Alistair Francis <alistair23 at gmail dot com>, Alistair Francis <alistair dot francis at wdc dot com>, GNU C Library <libc-alpha at sourceware dot org>, Florian Weimer <fweimer at redhat dot com>, Florian Weimer <fw at deneb dot enyo dot de>, Zack Weinberg <zackw at panix dot com>, Carlos O'Donell <carlos at redhat dot com>
- Date: Wed, 4 Dec 2019 16:41:40 -0300
- Subject: Re: [PATCH 3/5] timer: Decouple x86_64 specific timer_settime from generic Linux implementation
- References: <20191111214758.3677-1-lukma@denx.de> <20191111214758.3677-4-lukma@denx.de>
On 11/11/2019 18:47, Lukasz Majewski wrote:
> The x86_64 specific timer_settime implementation (from
> ./linux/x86_64/timer_settime.c) reused the Linux generic one (from
> ./linux/timer_settime.c) to implement handling some compatible timers
> (previously defined in librt, now in libc).
>
> As the generic implementation now is going to also support new (available
> from Linux 5.1+) timer_settime64 syscall, those two implementations have
> been decoupled for easier conversion.
LGTM with a nit below.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> sysdeps/unix/sysv/linux/timer_settime.c | 7 -------
> sysdeps/unix/sysv/linux/x86_64/timer_settime.c | 14 ++++++++++----
> 2 files changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/timer_settime.c b/sysdeps/unix/sysv/linux/timer_settime.c
> index a8350aedaa..51f24200aa 100644
> --- a/sysdeps/unix/sysv/linux/timer_settime.c
> +++ b/sysdeps/unix/sysv/linux/timer_settime.c
> @@ -22,17 +22,10 @@
> #include <sysdep.h>
> #include "kernel-posix-timers.h"
>
> -
> -#ifdef timer_settime_alias
> -# define timer_settime timer_settime_alias
> -#endif
> -
> -
> int
> timer_settime (timer_t timerid, int flags, const struct itimerspec *value,
> struct itimerspec *ovalue)
> {
> -#undef timer_settime
> struct timer *kt = (struct timer *) timerid;
>
> /* Delete the kernel timer object. */
Ok.
> diff --git a/sysdeps/unix/sysv/linux/x86_64/timer_settime.c b/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
> index ea8978d5cd..b71a82e8cc 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
> +++ b/sysdeps/unix/sysv/linux/x86_64/timer_settime.c
> @@ -17,13 +17,19 @@
> not, see <https://www.gnu.org/licenses/>. */
>
> #include <shlib-compat.h>
> +#include <sysdep.h>
> +#include "kernel-posix-timers.h"
> #include "compat-timer.h"
>
> +int
> +__timer_settime_new (timer_t timerid, int flags, const struct itimerspec *value,
> + struct itimerspec *ovalue)
> +{
> + struct timer *kt = (struct timer *) timerid;
>
> -#define timer_settime_alias __timer_settime_new
> -#include <sysdeps/unix/sysv/linux/timer_settime.c>
> -
> -#undef timer_settime
> + return INLINE_SYSCALL (timer_settime, 4, kt->ktimerid, flags,
> + value, ovalue);
> +}
Use INLINE_SYSCALL_CALL.
> versioned_symbol (librt, __timer_settime_new, timer_settime, GLIBC_2_3_3);
>
>
>