[2/4] 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/15/2015 03:21 PM, Adhemerval Zanella wrote:
> diff --git a/sysdeps/unix/sysv/linux/gettimeofday.c b/sysdeps/unix/sysv/linux/gettimeofday.c
> new file mode 100644
> index 0000000..5eaafc0
> --- /dev/null
> +++ b/sysdeps/unix/sysv/linux/gettimeofday.c
> @@ -0,0 +1,35 @@
[...]
> +#include <errno.h>
> +#include <sys/time.h>
> +#if HAVE_GETTIMEOFDAY_VSYSCAL
Name it HAVE_GETTIMEOFDAY_VSYSCALL instead?
^
> +# include <bits/libc-vdso.h>
> +#endif
> +
> +/* 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);
> +}
Rather than adding no-op INLINE_VSYSCALL definitions to all
architectures (patch #1), couldn't the common gettimeofday code be made
to effectively do:
#if HAVE_GETTIMEOFDAY_VSYSCALL
return INLINE_VSYSCALL (gettimeofday, ...);
#else
return INLINE_SYSCALL (gettimeofday, ...);
#endif
Hi
On 15-04-2015 18:01, Nathan Lynch wrote:
> On 04/15/2015 03:21 PM, Adhemerval Zanella wrote:
>> diff --git a/sysdeps/unix/sysv/linux/gettimeofday.c b/sysdeps/unix/sysv/linux/gettimeofday.c
>> new file mode 100644
>> index 0000000..5eaafc0
>> --- /dev/null
>> +++ b/sysdeps/unix/sysv/linux/gettimeofday.c
>> @@ -0,0 +1,35 @@
>
> [...]
>
>> +#include <errno.h>
>> +#include <sys/time.h>
>> +#if HAVE_GETTIMEOFDAY_VSYSCAL
>
> Name it HAVE_GETTIMEOFDAY_VSYSCALL instead?
I will change it, thanks.
> ^
>
>> +# include <bits/libc-vdso.h>
>> +#endif
>> +
>> +/* 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);
>> +}
>
> Rather than adding no-op INLINE_VSYSCALL definitions to all
> architectures (patch #1), couldn't the common gettimeofday code be made
> to effectively do:
>
> #if HAVE_GETTIMEOFDAY_VSYSCALL
> return INLINE_VSYSCALL (gettimeofday, ...);
> #else
> return INLINE_SYSCALL (gettimeofday, ...);
> #endif
>
My idea is to exactly get rid of this kind of #if in code and a further cleanup
I am planning to do is to move the INLINE_VSYSCALL in a platform neutral header
and make the vDSO declaration a macro to be used systematically in all ports.
On Wed, 2015-04-15 at 16:01 -0500, Nathan Lynch wrote:
> On 04/15/2015 03:21 PM, Adhemerval Zanella wrote:
> > diff --git a/sysdeps/unix/sysv/linux/gettimeofday.c b/sysdeps/unix/sysv/linux/gettimeofday.c
> > new file mode 100644
> > index 0000000..5eaafc0
> > --- /dev/null
> > +++ b/sysdeps/unix/sysv/linux/gettimeofday.c
> > @@ -0,0 +1,35 @@
>
> [...]
>
> > +#include <errno.h>
> > +#include <sys/time.h>
> > +#if HAVE_GETTIMEOFDAY_VSYSCAL
>
> Name it HAVE_GETTIMEOFDAY_VSYSCALL instead?
Why didn't this fail a build due to an undef warning?
On 16-04-2015 09:00, Torvald Riegel wrote:
> On Wed, 2015-04-15 at 16:01 -0500, Nathan Lynch wrote:
>> On 04/15/2015 03:21 PM, Adhemerval Zanella wrote:
>>> diff --git a/sysdeps/unix/sysv/linux/gettimeofday.c b/sysdeps/unix/sysv/linux/gettimeofday.c
>>> new file mode 100644
>>> index 0000000..5eaafc0
>>> --- /dev/null
>>> +++ b/sysdeps/unix/sysv/linux/gettimeofday.c
>>> @@ -0,0 +1,35 @@
>>
>> [...]
>>
>>> +#include <errno.h>
>>> +#include <sys/time.h>
>>> +#if HAVE_GETTIMEOFDAY_VSYSCAL
>>
>> Name it HAVE_GETTIMEOFDAY_VSYSCALL instead?
>
> Why didn't this fail a build due to an undef warning?
>
Because I used HAVE_GETTIMEOFDAY_VSYSCAL 'consistently' over the patch.
deleted file mode 100644
@@ -1,38 +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
-
-#include <bits/libc-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)
@@ -208,6 +208,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_VSYSCAL 1
# define INTERNAL_VSYSCALL_NCS(funcptr, err, nr, args...) \
({ \
new file mode 100644
@@ -0,0 +1,35 @@
+/* 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>
+#if HAVE_GETTIMEOFDAY_VSYSCAL
+# include <bits/libc-vdso.h>
+#endif
+
+/* 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,39 +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>
-
-#include <bits/libc-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_VSYSCAL 1
/* This version is for kernels that implement system calls that
behave like function calls as far as register saving.
@@ -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_VSYSCAL 1
/* This version is for kernels that implement system calls that
behave like function calls as far as register saving.
deleted file mode 100644
@@ -1,32 +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>
-#include <bits/libc-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)
@@ -266,6 +266,7 @@
/* List of system calls which are supported as vsyscalls. */
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
+#define HAVE_GETTIMEOFDAY_VSYSCAL 1
/* Pointer mangling support. */
#if IS_IN (rtld)