From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: [PATCH 07/16] linux: Consolidate time implementation
Date: Tue, 17 Dec 2019 18:47:19 -0300 [thread overview]
Message-ID: <20191217214728.2886-7-adhemerval.zanella@linaro.org> (raw)
In-Reply-To: <20191217214728.2886-1-adhemerval.zanella@linaro.org>
The IFUNC bypass to vDSO is used when USE_IFUNC_TIME is set.
Currently powerpc and x86 defines it. Otherwise the generic
implementation is used, which calls clock_gettime.
Checked on powerpc64le-linux-gnu, powerpc64-linux-gnu,
powerpc-linux-gnu-power4, x86_64-linux-gnu, and i686-linux-gnu.
---
sysdeps/unix/sysv/linux/powerpc/time.c | 32 +---------------
sysdeps/unix/sysv/linux/time.c | 51 ++++++++++++++++++++++++++
sysdeps/unix/sysv/linux/x86/time.c | 27 +-------------
3 files changed, 55 insertions(+), 55 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/time.c
diff --git a/sysdeps/unix/sysv/linux/powerpc/time.c b/sysdeps/unix/sysv/linux/powerpc/time.c
index f2b4c76be8..3622ef48f6 100644
--- a/sysdeps/unix/sysv/linux/powerpc/time.c
+++ b/sysdeps/unix/sysv/linux/powerpc/time.c
@@ -16,33 +16,5 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <time.h>
-#include <sysdep.h>
-#include <sysdep-vdso.h>
-
-static time_t
-time_vsyscall (time_t *t)
-{
- return INLINE_VSYSCALL (time, 1, t);
-}
-
-#ifdef SHARED
-# include <dl-vdso.h>
-# include <libc-vdso.h>
-
-# define INIT_ARCH() \
- void *vdso_time = get_vdso_symbol (HAVE_TIME_VSYSCALL);
-
-/* If the vDSO is not available we fall back to the syscall. */
-libc_ifunc (time,
- vdso_time
- ? VDSO_IFUNC_RET (vdso_time)
- : (void *) time_vsyscall);
-
-#else
-time_t
-time (time_t *t)
-{
- return time_vsyscall (t);
-}
-#endif /* !SHARED */
+#define USE_IFUNC_TIME
+#include <sysdeps/unix/sysv/linux/time.c>
diff --git a/sysdeps/unix/sysv/linux/time.c b/sysdeps/unix/sysv/linux/time.c
new file mode 100644
index 0000000000..0598958c9c
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/time.c
@@ -0,0 +1,51 @@
+/* time -- Get number of seconds since Epoch. Linux version.
+ Copyright (C) 2019 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <https://www.gnu.org/licenses/>. */
+
+/* Some architecture might optimize the time by setting the plt direct
+ to vDSO symbol by using a IFUNC. */
+#ifdef USE_IFUNC_TIME
+# include <time.h>
+# include <sysdep.h>
+# include <sysdep-vdso.h>
+
+#ifdef SHARED
+# include <dl-vdso.h>
+
+static time_t
+time_syscall (time_t *t)
+{
+ return INLINE_SYSCALL_CALL (time, t);
+}
+
+# undef INIT_ARCH
+# define INIT_ARCH() \
+ void *vdso_time = get_vdso_symbol (HAVE_TIME_VSYSCALL);
+libc_ifunc (time,
+ vdso_time ? VDSO_IFUNC_RET (vdso_time)
+ : (void *) time_syscall);
+
+# else
+time_t
+time (time_t *t)
+{
+ return INLINE_VSYSCALL (time, 1, t);
+}
+# endif /* !SHARED */
+#else /* USE_IFUNC_TIME */
+# include <time/time.c>
+#endif
diff --git a/sysdeps/unix/sysv/linux/x86/time.c b/sysdeps/unix/sysv/linux/x86/time.c
index 67188a2ceb..7b1d7bac76 100644
--- a/sysdeps/unix/sysv/linux/x86/time.c
+++ b/sysdeps/unix/sysv/linux/x86/time.c
@@ -16,28 +16,5 @@
License along with the GNU C Library; if not, see
<https://www.gnu.org/licenses/>. */
-#include <time.h>
-#include <sysdep.h>
-#include <sysdep-vdso.h>
-
-static time_t
-time_vsyscall (time_t *t)
-{
- return INLINE_VSYSCALL (time, 1, t);
-}
-
-#ifdef SHARED
-# include <dl-vdso.h>
-# include <libc-vdso.h>
-
-#undef INIT_ARCH
-#define INIT_ARCH()
-/* If the vDSO is not available we fall back on the syscall. */
-libc_ifunc (time, (get_vdso_symbol ("__vdso_time") ?: time_vsyscall))
-#else
-time_t
-time (time_t *t)
-{
- return time_vsyscall (t);
-}
-#endif
+#define USE_IFUNC_TIME
+#include <sysdeps/unix/sysv/linux/time.c>
--
2.17.1
next prev parent reply other threads:[~2019-12-17 21:48 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-17 21:47 [PATCH v2 01/16] linux: Fix vDSO macros build with time64 interfaces Adhemerval Zanella
2019-12-17 21:47 ` [PATCH v2 02/16] x86: Make x32 use x86 time implementation Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 03/16] Remove vDSO support from make-syscall.sh Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 04/16] linux: Update x86 vDSO symbols Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 05/16] linux: Update mips " Adhemerval Zanella
2020-01-02 12:08 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 06/16] linux: Consolidate Linux gettimeofday Adhemerval Zanella
2019-12-18 8:46 ` Andreas Schwab
2019-12-18 14:50 ` Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` Adhemerval Zanella [this message]
2020-01-02 12:51 ` [PATCH 07/16] linux: Consolidate time implementation Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH v3 08/16] elf: Enable relro for static build Adhemerval Zanella
2020-01-02 12:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH v3 09/16] elf: Move vDSO setup to rtld (BZ#24967) Adhemerval Zanella
2020-01-02 12:55 ` Siddhesh Poyarekar
2020-01-02 13:00 ` Adhemerval Zanella
2020-01-07 16:13 ` [PATCH v3 09/16] elf: Move vDSO setup to rtld (BZ#24967) - regression found Lukasz Majewski
2020-01-07 19:40 ` Adhemerval Zanella
2019-12-17 21:47 ` [PATCH v2 10/16] linux: Add support for clock_gettime64 vDSO Adhemerval Zanella
2020-01-02 13:03 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 11/16] linux: Optimize fallback 32-bit clock_gettime Adhemerval Zanella
2019-12-18 8:53 ` Andreas Schwab
2019-12-18 14:58 ` Adhemerval Zanella
2020-01-02 13:07 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 12/16] linux: Enable vDSO clock_gettime64 for i386 Adhemerval Zanella
2020-01-02 13:08 ` Siddhesh Poyarekar
2020-01-02 13:08 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 13/16] linux: Enable vDSO clock_gettime64 for arm Adhemerval Zanella
2020-01-02 13:08 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 14/16] linux: Enable vDSO clock_gettime64 for mips Adhemerval Zanella
2019-12-18 15:33 ` Florian Weimer
2020-01-02 13:13 ` Siddhesh Poyarekar
2020-01-02 13:50 ` Adhemerval Zanella
2020-01-02 14:09 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH v2 15/16] linux: Add support for clock_getres64 vDSO Adhemerval Zanella
2020-01-02 13:15 ` Siddhesh Poyarekar
2019-12-17 21:47 ` [PATCH 16/16] linux: Optimize fallback 32-bit clock_getres Adhemerval Zanella
2019-12-18 8:56 ` Andreas Schwab
2019-12-18 14:58 ` Adhemerval Zanella
2019-12-18 15:02 ` Adhemerval Zanella
2020-01-02 13:16 ` Siddhesh Poyarekar
2020-01-02 12:07 ` [PATCH v2 01/16] linux: Fix vDSO macros build with time64 interfaces Siddhesh Poyarekar
2020-01-02 12:55 ` Adhemerval Zanella
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=20191217214728.2886-7-adhemerval.zanella@linaro.org \
--to=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).