From: Lukasz Majewski <lukma@denx.de>
To: Joseph Myers <joseph@codesourcery.com>, Paul Eggert <eggert@cs.ucla.edu>
Cc: Alistair Francis <alistair23@gmail.com>,
Alistair Francis <alistair.francis@wdc.com>,
GNU C Library <libc-alpha@sourceware.org>,
Adhemerval Zanella <adhemerval.zanella@linaro.org>,
Florian Weimer <fweimer@redhat.com>,
Florian Weimer <fw@deneb.enyo.de>,
Zack Weinberg <zackw@panix.com>,
Carlos O'Donell <carlos@redhat.com>,
Lukasz Majewski <lukma@denx.de>
Subject: [PATCH 3/5] timer: Decouple x86_64 specific timer_settime from generic Linux implementation
Date: Mon, 11 Nov 2019 22:47:56 +0100 [thread overview]
Message-ID: <20191111214758.3677-4-lukma@denx.de> (raw)
In-Reply-To: <20191111214758.3677-1-lukma@denx.de>
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.
---
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. */
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);
+}
versioned_symbol (librt, __timer_settime_new, timer_settime, GLIBC_2_3_3);
--
2.20.1
next prev parent reply other threads:[~2019-11-11 21:48 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-11 21:47 [PATCH 0/5] y2038: linux: timer_[sg]ettime conversion to 64 bit time Lukasz Majewski
2019-11-11 21:47 ` [PATCH 1/5] time: Introduce glibc's internal struct __itimerspec64 Lukasz Majewski
2019-11-27 16:59 ` Lukasz Majewski
2019-12-04 19:41 ` Adhemerval Zanella
2019-11-11 21:47 ` [PATCH 2/5] timer: Decouple x86_64 specific timer_gettime from generic Linux implementation Lukasz Majewski
2019-11-27 16:59 ` Lukasz Majewski
2019-12-04 19:41 ` Adhemerval Zanella
2019-11-11 21:47 ` Lukasz Majewski [this message]
2019-11-27 16:59 ` [PATCH 3/5] timer: Decouple x86_64 specific timer_settime " Lukasz Majewski
2019-12-04 19:41 ` Adhemerval Zanella
2019-11-11 21:47 ` [PATCH 4/5] y2038: linux: Provide __timer_gettime64 implementation Lukasz Majewski
2019-11-27 17:00 ` Lukasz Majewski
2019-12-04 19:41 ` Adhemerval Zanella
2019-12-05 9:42 ` Lukasz Majewski
2019-12-11 17:51 ` Andreas Schwab
2019-12-11 22:26 ` Lukasz Majewski
2019-12-12 15:26 ` Andreas Schwab
2019-12-12 15:33 ` Lukasz Majewski
2019-12-12 15:46 ` Andreas Schwab
2019-12-12 16:05 ` Lukasz Majewski
2019-12-12 16:08 ` Andreas Schwab
2019-11-11 21:47 ` [PATCH 5/5] y2038: linux: Provide __timer_settime64 implementation Lukasz Majewski
2019-11-27 17:00 ` Lukasz Majewski
2019-12-04 19:41 ` Adhemerval Zanella
2019-11-18 22:00 ` [PATCH 0/5] y2038: linux: timer_[sg]ettime conversion to 64 bit time Lukasz Majewski
2019-11-25 8:34 ` Lukasz Majewski
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191111214758.3677-4-lukma@denx.de \
--to=lukma@denx.de \
--cc=adhemerval.zanella@linaro.org \
--cc=alistair.francis@wdc.com \
--cc=alistair23@gmail.com \
--cc=carlos@redhat.com \
--cc=eggert@cs.ucla.edu \
--cc=fw@deneb.enyo.de \
--cc=fweimer@redhat.com \
--cc=joseph@codesourcery.com \
--cc=libc-alpha@sourceware.org \
--cc=zackw@panix.com \
/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).