From patchwork Mon Nov 11 21:47:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 35803 Received: (qmail 77779 invoked by alias); 11 Nov 2019 21:48:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 77573 invoked by uid 89); 11 Nov 2019 21:48:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.3 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy=HX-Languages-Length:2177, timer X-HELO: mail-out.m-online.net From: Lukasz Majewski To: Joseph Myers , Paul Eggert Cc: Alistair Francis , Alistair Francis , GNU C Library , Adhemerval Zanella , Florian Weimer , Florian Weimer , Zack Weinberg , Carlos O'Donell , Lukasz Majewski Subject: [PATCH 3/5] timer: Decouple x86_64 specific timer_settime from generic Linux implementation Date: Mon, 11 Nov 2019 22:47:56 +0100 Message-Id: <20191111214758.3677-4-lukma@denx.de> In-Reply-To: <20191111214758.3677-1-lukma@denx.de> References: <20191111214758.3677-1-lukma@denx.de> MIME-Version: 1.0 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. Reviewed-by: Adhemerval Zanella --- 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 #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. */ 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 . */ #include +#include +#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 - -#undef timer_settime + return INLINE_SYSCALL (timer_settime, 4, kt->ktimerid, flags, + value, ovalue); +} versioned_symbol (librt, __timer_settime_new, timer_settime, GLIBC_2_3_3);