[v2,2/3] Consolidate gettimeofday across aarch64/s390/tile
Commit Message
This patch removes the architecture specific gettimeofday implementation
to use the vDSO symbol and consolidate it on a common Linux one.
Similat to gettime and getres vDSO implementation, each arch that supports
gettimeofday through vDSO should just implement INLINE_VSYSCALL to access
the symbol and define HAVE_GETTIMEOFDAY_VSYSCAL as 1.
--
* sysdeps/unix/sysv/linux/aarch64/gettimeofday.c: Remove file.
* sysdeps/unix/sysv/linux/s390/gettimeofday.c: Likewise.
* sysdeps/unix/sysv/linux/tile/gettimeofday.c: Likewise.
* sysdeps/unix/sysv/linux/aarch64/sysdep.h
[HAVE_GETTIMEOFDAY_VSYSCAL]: Define.
* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
[HAVE_GETTIMEOFDAY_VSYSCAL]: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
[HAVE_GETTIMEOFDAY_VSYSCAL]: Likewise.
* sysdeps/unix/sysv/linux/tile/sysdep.h
[HAVE_GETTIMEOFDAY_VSYSCAL]: Likewise.
* sysdeps/unix/sysv/linux/gettimeofday.c: New file: gettimeofday
using vDSO syscall macro.
---
Comments
On 04/20/2015 11:48 AM, Adhemerval Zanella wrote:
> This patch removes the architecture specific gettimeofday implementation
> to use the vDSO symbol and consolidate it on a common Linux one.
> Similat to gettime and getres vDSO implementation, each arch that supports
> gettimeofday through vDSO should just implement INLINE_VSYSCALL to access
> the symbol and define HAVE_GETTIMEOFDAY_VSYSCAL as 1.
>
> --
>
> * sysdeps/unix/sysv/linux/aarch64/gettimeofday.c: Remove file.
> * sysdeps/unix/sysv/linux/s390/gettimeofday.c: Likewise.
> * sysdeps/unix/sysv/linux/tile/gettimeofday.c: Likewise.
> * sysdeps/unix/sysv/linux/aarch64/sysdep.h
> [HAVE_GETTIMEOFDAY_VSYSCAL]: Define.
> * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
> [HAVE_GETTIMEOFDAY_VSYSCAL]: Likewise.
> * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
> [HAVE_GETTIMEOFDAY_VSYSCAL]: Likewise.
> * sysdeps/unix/sysv/linux/tile/sysdep.h
> [HAVE_GETTIMEOFDAY_VSYSCAL]: Likewise.
Please make the spelling of HAVE_GETTIMEOFDAY_VSYSCALL in the patch
description and Changelog match its spelling in the code... :)
Hi
On 22-04-2015 13:24, Nathan Lynch wrote:
> On 04/20/2015 11:48 AM, Adhemerval Zanella wrote:
>> This patch removes the architecture specific gettimeofday implementation
>> to use the vDSO symbol and consolidate it on a common Linux one.
>> Similat to gettime and getres vDSO implementation, each arch that supports
>> gettimeofday through vDSO should just implement INLINE_VSYSCALL to access
>> the symbol and define HAVE_GETTIMEOFDAY_VSYSCAL as 1.
>>
>> --
>>
>> * sysdeps/unix/sysv/linux/aarch64/gettimeofday.c: Remove file.
>> * sysdeps/unix/sysv/linux/s390/gettimeofday.c: Likewise.
>> * sysdeps/unix/sysv/linux/tile/gettimeofday.c: Likewise.
>> * sysdeps/unix/sysv/linux/aarch64/sysdep.h
>> [HAVE_GETTIMEOFDAY_VSYSCAL]: Define.
>> * sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
>> [HAVE_GETTIMEOFDAY_VSYSCAL]: Likewise.
>> * sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
>> [HAVE_GETTIMEOFDAY_VSYSCAL]: Likewise.
>> * sysdeps/unix/sysv/linux/tile/sysdep.h
>> [HAVE_GETTIMEOFDAY_VSYSCAL]: Likewise.
>
> Please make the spelling of HAVE_GETTIMEOFDAY_VSYSCALL in the patch
> description and Changelog match its spelling in the code... :)
>
>
Ouch and thanks, I will fix it.
deleted file mode 100644
@@ -1,39 +0,0 @@
-/* Copyright (C) 2005-2015 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
- <http://www.gnu.org/licenses/>. */
-
-#include <errno.h>
-#include <sys/time.h>
-
-#undef __gettimeofday
-
-#define HAVE_VSYSCALL
-#include <sysdep-vdso.h>
-
-/* Get the current time of day and timezone information,
- putting it into *tv and *tz. If tz is null, *tz is not filled.
- Returns 0 on success, -1 on errors. */
-int
-__gettimeofday (tv, tz)
- struct timeval *tv;
- struct timezone *tz;
-{
- return INLINE_VSYSCALL (gettimeofday, 2, tv, tz);
-}
-libc_hidden_def (__gettimeofday)
-weak_alias (__gettimeofday, gettimeofday)
-libc_hidden_weak (gettimeofday)
@@ -155,6 +155,7 @@
/* List of system calls which are supported as vsyscalls. */
# define HAVE_CLOCK_GETRES_VSYSCALL 1
# define HAVE_CLOCK_GETTIME_VSYSCALL 1
+# define HAVE_GETTIMEOFDAY_VSYSCALL 1
# define INTERNAL_VSYSCALL_NCS(funcptr, err, nr, args...) \
({ \
new file mode 100644
@@ -0,0 +1,39 @@
+/* Copyright (C) 2015 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <errno.h>
+#include <sys/time.h>
+
+#undef __gettimeofday
+
+#ifdef HAVE_GETTIMEOFDAY_VSYSCALL
+# define HAVE_VSYSCALL
+#endif
+#include <sysdep-vdso.h>
+
+/* Get the current time of day and timezone information,
+ putting it into *tv and *tz. If tz is null, *tz is not filled.
+ Returns 0 on success, -1 on errors. */
+int
+__gettimeofday (struct timeval *tv, struct timezone *tz)
+{
+ return INLINE_VSYSCALL (gettimeofday, 2, tv, tz);
+}
+libc_hidden_def (__gettimeofday)
+weak_alias (__gettimeofday, gettimeofday)
+libc_hidden_weak (gettimeofday)
deleted file mode 100644
@@ -1,40 +0,0 @@
-/* Copyright (C) 2008-2015 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
- <http://www.gnu.org/licenses/>. */
-
-#include <sysdep.h>
-#include <stddef.h>
-#include <sys/time.h>
-#include <time.h>
-#include <hp-timing.h>
-
-#define HAVE_VSYSCALL
-#include <sysdep-vdso.h>
-
-/* Get the current time of day and timezone information,
- putting it into *TV and *TZ. If TZ is NULL, *TZ is not filled.
- Returns 0 on success, -1 on errors. */
-
-int
-__gettimeofday (tv, tz)
- struct timeval *tv;
- struct timezone *tz;
-{
- return INLINE_VSYSCALL (gettimeofday, 2, tv, tz);
-}
-libc_hidden_def (__gettimeofday)
-weak_alias (__gettimeofday, gettimeofday)
-libc_hidden_weak (gettimeofday)
@@ -281,6 +281,7 @@
/* List of system calls which are supported as vsyscalls. */
#define HAVE_CLOCK_GETRES_VSYSCALL 1
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
+#define HAVE_GETTIMEOFDAY_VSYSCALL 1
/* This version is for internal uses when there is no desire
to set errno */
@@ -287,6 +287,7 @@
/* List of system calls which are supported as vsyscalls. */
#define HAVE_CLOCK_GETRES_VSYSCALL 1
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
+#define HAVE_GETTIMEOFDAY_VSYSCALL 1
/* This version is for internal uses when there is no desire
to set errno */
deleted file mode 100644
@@ -1,34 +0,0 @@
-/* Copyright (C) 2012-2015 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
- <http://www.gnu.org/licenses/>. */
-
-#include <sysdep.h>
-#include <stddef.h>
-#include <sys/time.h>
-#include <time.h>
-
-#define HAVE_VSYSCALL
-#include <sysdep-vdso.h>
-
-int
-__gettimeofday (struct timeval *tv, struct timezone *tz)
-{
- return INLINE_VSYSCALL (gettimeofday, 2, tv, tz);
-}
-
-libc_hidden_def (__gettimeofday)
-weak_alias (__gettimeofday, gettimeofday)
-libc_hidden_weak (gettimeofday)
@@ -212,6 +212,7 @@
/* List of system calls which are supported as vsyscalls. */
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
+#define HAVE_GETTIMEOFDAY_VSYSCALL 1
#endif /* __ASSEMBLER__ */