This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH 2/5] timer: Decouple x86_64 specific timer_gettime from generic Linux implementation
- From: Adhemerval Zanella <adhemerval dot zanella at linaro dot org>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Wed, 4 Dec 2019 16:41:36 -0300
- Subject: Re: [PATCH 2/5] timer: Decouple x86_64 specific timer_gettime from generic Linux implementation
- References: <20191111214758.3677-1-lukma@denx.de> <20191111214758.3677-3-lukma@denx.de>
On 11/11/2019 18:47, Lukasz Majewski wrote:
> The x86_64 specific timer_gettime implementation (from
> ./linux/x86_64/timer_gettime.c) reused the Linux generic one (from
> ./linux/timer_gettime.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_gettime64 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_gettime.c | 7 -------
> sysdeps/unix/sysv/linux/x86_64/timer_gettime.c | 12 ++++++++----
> 2 files changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/timer_gettime.c b/sysdeps/unix/sysv/linux/timer_gettime.c
> index 799e2c935e..8d9bef9196 100644
> --- a/sysdeps/unix/sysv/linux/timer_gettime.c
> +++ b/sysdeps/unix/sysv/linux/timer_gettime.c
> @@ -22,16 +22,9 @@
> #include <sysdep.h>
> #include "kernel-posix-timers.h"
>
> -
> -#ifdef timer_gettime_alias
> -# define timer_gettime timer_gettime_alias
> -#endif
> -
> -
> int
> timer_gettime (timer_t timerid, struct itimerspec *value)
> {
> -#undef timer_gettime
> struct timer *kt = (struct timer *) timerid;
>
> /* Delete the kernel timer object. */
Ok.
> diff --git a/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c b/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
> index 54daee2f4c..5755cc44fb 100644
> --- a/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
> +++ b/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c
> @@ -17,13 +17,17 @@
> 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_gettime_new (timer_t timerid, struct itimerspec *value)
> +{
> + struct timer *kt = (struct timer *) timerid;
>
> -#define timer_gettime_alias __timer_gettime_new
> -#include <sysdeps/unix/sysv/linux/timer_gettime.c>
> -
> -#undef timer_gettime
> + return INLINE_SYSCALL (timer_gettime, 2, kt->ktimerid, value);
Use INLINE_SYSCALL_CALL.
> +}
> versioned_symbol (librt, __timer_gettime_new, timer_gettime, GLIBC_2_3_3);
>
>
>