[v3,2/3] Consolidate gettimeofday across aarch64/s390/tile

Message ID 5550FEF8.50501@linaro.org
State New
Headers show

Commit Message

Adhemerval Zanella May 11, 2015, 7:11 p.m.
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.

Tested on i386, x32, x86_64, ppc64le and aarch64.  Ok to apply?

Changes from previous version:

- Fix SYSCALL spelling.

--

	* 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_VSYSCALL]: Define.
	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
	[HAVE_GETTIMEOFDAY_VSYSCALL]: Likewise.
	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
	[HAVE_GETTIMEOFDAY_VSYSCALL]: Likewise.
	* sysdeps/unix/sysv/linux/tile/sysdep.h
	[HAVE_GETTIMEOFDAY_VSYSCALL]: Likewise.
	* sysdeps/unix/sysv/linux/gettimeofday.c: New file: gettimeofday
	using vDSO syscall macro.

---

Comments

Adhemerval Zanella May 19, 2015, 7:50 p.m. | #1
On 19-05-2015 14:42, Nathan Lynch wrote:
> On 05/11/2015 02:11 PM, 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.
>>
>> Tested on i386, x32, x86_64, ppc64le and aarch64.  Ok to apply?
>>
>> Changes from previous version:
>>
>> - Fix SYSCALL spelling.
>>
>> --
>>
>> 	* 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_VSYSCALL]: Define.
>> 	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
>> 	[HAVE_GETTIMEOFDAY_VSYSCALL]: Likewise.
>> 	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
>> 	[HAVE_GETTIMEOFDAY_VSYSCALL]: Likewise.
>> 	* sysdeps/unix/sysv/linux/tile/sysdep.h
>> 	[HAVE_GETTIMEOFDAY_VSYSCALL]: Likewise.
>> 	* sysdeps/unix/sysv/linux/gettimeofday.c: New file: gettimeofday
>> 	using vDSO syscall macro.
>>
> 
> With this change, do the #undefs in init-first.c (seen in aarch64, s390,
> powerpc, but not tile or x86) become unnecessary?
> 
> # include <dl-vdso.h>
> # undef __gettimeofday
> # undef __clock_gettime
> # undef __clock_getres
> # include <libc-vdso.h>
> 
> 
> Otherwise looks fine to me.
> 

Indeed the #undef's are not really required any more and in my testing builds
aarch64, s390 and powerpc all built fine without. I will remove them.

Any more concerns about it? I would like to install it.
Adhemerval Zanella May 26, 2015, 8:28 p.m. | #2
On 19-05-2015 16:50, Adhemerval Zanella wrote:
> 
> 
> On 19-05-2015 14:42, Nathan Lynch wrote:
>> On 05/11/2015 02:11 PM, 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.
>>>
>>> Tested on i386, x32, x86_64, ppc64le and aarch64.  Ok to apply?
>>>
>>> Changes from previous version:
>>>
>>> - Fix SYSCALL spelling.
>>>
>>> --
>>>
>>> 	* 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_VSYSCALL]: Define.
>>> 	* sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
>>> 	[HAVE_GETTIMEOFDAY_VSYSCALL]: Likewise.
>>> 	* sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
>>> 	[HAVE_GETTIMEOFDAY_VSYSCALL]: Likewise.
>>> 	* sysdeps/unix/sysv/linux/tile/sysdep.h
>>> 	[HAVE_GETTIMEOFDAY_VSYSCALL]: Likewise.
>>> 	* sysdeps/unix/sysv/linux/gettimeofday.c: New file: gettimeofday
>>> 	using vDSO syscall macro.
>>>
>>
>> With this change, do the #undefs in init-first.c (seen in aarch64, s390,
>> powerpc, but not tile or x86) become unnecessary?
>>
>> # include <dl-vdso.h>
>> # undef __gettimeofday
>> # undef __clock_gettime
>> # undef __clock_getres
>> # include <libc-vdso.h>
>>
>>
>> Otherwise looks fine to me.
>>
> 
> Indeed the #undef's are not really required any more and in my testing builds
> aarch64, s390 and powerpc all built fine without. I will remove them.
> 
> Any more concerns about it? I would like to install it.
> 

Pushed as 97554e4382e5d85eccf146b58f85aaad7e3d687c

Patch

diff --git a/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c b/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c
deleted file mode 100644
index daa6538..0000000
--- a/sysdeps/unix/sysv/linux/aarch64/gettimeofday.c
+++ /dev/null
@@ -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)
diff --git a/sysdeps/unix/sysv/linux/aarch64/sysdep.h b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
index 80716c7..0a0a278 100644
--- a/sysdeps/unix/sysv/linux/aarch64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/aarch64/sysdep.h
@@ -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...)	\
   ({								\
diff --git a/sysdeps/unix/sysv/linux/gettimeofday.c b/sysdeps/unix/sysv/linux/gettimeofday.c
new file mode 100644
index 0000000..d88c39f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/gettimeofday.c
@@ -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)
diff --git a/sysdeps/unix/sysv/linux/s390/gettimeofday.c b/sysdeps/unix/sysv/linux/s390/gettimeofday.c
deleted file mode 100644
index 9f98f29..0000000
--- a/sysdeps/unix/sysv/linux/s390/gettimeofday.c
+++ /dev/null
@@ -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)
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
index a773a28..c768df1 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/sysdep.h
@@ -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 */
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
index c944634..c041153 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/sysdep.h
@@ -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 */
diff --git a/sysdeps/unix/sysv/linux/tile/gettimeofday.c b/sysdeps/unix/sysv/linux/tile/gettimeofday.c
deleted file mode 100644
index 13382ab..0000000
--- a/sysdeps/unix/sysv/linux/tile/gettimeofday.c
+++ /dev/null
@@ -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)
diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h
index 30d52e3..1f4122c 100644
--- a/sysdeps/unix/sysv/linux/tile/sysdep.h
+++ b/sysdeps/unix/sysv/linux/tile/sysdep.h
@@ -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__  */