mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Consolidate gettimeofday across aarch64/s390/tile
This patch removes the architecture specific gettimeofday implementation to use the vDSO symbol and consolidate it on a common Linux one. Similar to clock_gettime and clock_getres vDSO implementation, each port that supports gettimeofday through vDSO should just implement INLINE_VSYSCALL to access the symbol and define HAVE_{GETTIME,GETRES}_VSYSCAL as 1.
This commit is contained in:
committed by
Adhemerval Zanella
parent
6afb9c0175
commit
97554e4382
16
ChangeLog
16
ChangeLog
@ -1,3 +1,19 @@
|
|||||||
|
2015-05-26 Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
||||||
|
|
||||||
|
* 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.
|
||||||
|
|
||||||
2015-05-26 Andriy Rysin <arysin@gmail.com>
|
2015-05-26 Andriy Rysin <arysin@gmail.com>
|
||||||
|
|
||||||
[BZ #17293]
|
[BZ #17293]
|
||||||
|
@ -18,9 +18,6 @@
|
|||||||
|
|
||||||
#ifdef SHARED
|
#ifdef SHARED
|
||||||
# include <dl-vdso.h>
|
# include <dl-vdso.h>
|
||||||
# undef __gettimeofday
|
|
||||||
# undef __clock_gettime
|
|
||||||
# undef __clock_getres
|
|
||||||
# include <libc-vdso.h>
|
# include <libc-vdso.h>
|
||||||
|
|
||||||
int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden;
|
int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *) attribute_hidden;
|
||||||
|
@ -155,6 +155,7 @@
|
|||||||
/* List of system calls which are supported as vsyscalls. */
|
/* List of system calls which are supported as vsyscalls. */
|
||||||
# define HAVE_CLOCK_GETRES_VSYSCALL 1
|
# define HAVE_CLOCK_GETRES_VSYSCALL 1
|
||||||
# define HAVE_CLOCK_GETTIME_VSYSCALL 1
|
# define HAVE_CLOCK_GETTIME_VSYSCALL 1
|
||||||
|
# define HAVE_GETTIMEOFDAY_VSYSCALL 1
|
||||||
|
|
||||||
/* Define a macro which expands into the inline wrapper code for a system
|
/* Define a macro which expands into the inline wrapper code for a system
|
||||||
call. */
|
call. */
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
/* Copyright (C) 2005-2015 Free Software Foundation, Inc.
|
/* Copyright (C) 2015 Free Software Foundation, Inc.
|
||||||
|
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
@ -21,16 +21,16 @@
|
|||||||
|
|
||||||
#undef __gettimeofday
|
#undef __gettimeofday
|
||||||
|
|
||||||
#define HAVE_VSYSCALL
|
#ifdef HAVE_GETTIMEOFDAY_VSYSCALL
|
||||||
|
# define HAVE_VSYSCALL
|
||||||
|
#endif
|
||||||
#include <sysdep-vdso.h>
|
#include <sysdep-vdso.h>
|
||||||
|
|
||||||
/* Get the current time of day and timezone information,
|
/* Get the current time of day and timezone information,
|
||||||
putting it into *tv and *tz. If tz is null, *tz is not filled.
|
putting it into *tv and *tz. If tz is null, *tz is not filled.
|
||||||
Returns 0 on success, -1 on errors. */
|
Returns 0 on success, -1 on errors. */
|
||||||
int
|
int
|
||||||
__gettimeofday (tv, tz)
|
__gettimeofday (struct timeval *tv, struct timezone *tz)
|
||||||
struct timeval *tv;
|
|
||||||
struct timezone *tz;
|
|
||||||
{
|
{
|
||||||
return INLINE_VSYSCALL (gettimeofday, 2, tv, tz);
|
return INLINE_VSYSCALL (gettimeofday, 2, tv, tz);
|
||||||
}
|
}
|
@ -18,9 +18,6 @@
|
|||||||
|
|
||||||
#ifdef SHARED
|
#ifdef SHARED
|
||||||
# include <dl-vdso.h>
|
# include <dl-vdso.h>
|
||||||
# undef __gettimeofday
|
|
||||||
# undef __clock_gettime
|
|
||||||
# undef __clock_getres
|
|
||||||
# include <libc-vdso.h>
|
# include <libc-vdso.h>
|
||||||
|
|
||||||
int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
|
int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
|
||||||
|
@ -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)
|
|
@ -18,9 +18,6 @@
|
|||||||
|
|
||||||
#ifdef SHARED
|
#ifdef SHARED
|
||||||
# include <dl-vdso.h>
|
# include <dl-vdso.h>
|
||||||
# undef __gettimeofday
|
|
||||||
# undef __clock_gettime
|
|
||||||
# undef __clock_getres
|
|
||||||
# include <libc-vdso.h>
|
# include <libc-vdso.h>
|
||||||
|
|
||||||
long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
|
long int (*VDSO_SYMBOL(gettimeofday)) (struct timeval *, void *)
|
||||||
|
@ -281,6 +281,7 @@
|
|||||||
/* List of system calls which are supported as vsyscalls. */
|
/* List of system calls which are supported as vsyscalls. */
|
||||||
#define HAVE_CLOCK_GETRES_VSYSCALL 1
|
#define HAVE_CLOCK_GETRES_VSYSCALL 1
|
||||||
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
|
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
|
||||||
|
#define HAVE_GETTIMEOFDAY_VSYSCALL 1
|
||||||
|
|
||||||
/* This version is for internal uses when there is no desire
|
/* This version is for internal uses when there is no desire
|
||||||
to set errno */
|
to set errno */
|
||||||
|
@ -287,6 +287,7 @@
|
|||||||
/* List of system calls which are supported as vsyscalls. */
|
/* List of system calls which are supported as vsyscalls. */
|
||||||
#define HAVE_CLOCK_GETRES_VSYSCALL 1
|
#define HAVE_CLOCK_GETRES_VSYSCALL 1
|
||||||
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
|
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
|
||||||
|
#define HAVE_GETTIMEOFDAY_VSYSCALL 1
|
||||||
|
|
||||||
/* This version is for internal uses when there is no desire
|
/* This version is for internal uses when there is no desire
|
||||||
to set errno */
|
to set errno */
|
||||||
|
@ -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. */
|
/* List of system calls which are supported as vsyscalls. */
|
||||||
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
|
#define HAVE_CLOCK_GETTIME_VSYSCALL 1
|
||||||
|
#define HAVE_GETTIMEOFDAY_VSYSCALL 1
|
||||||
|
|
||||||
#endif /* __ASSEMBLER__ */
|
#endif /* __ASSEMBLER__ */
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user