mirror of
git://sourceware.org/git/glibc.git
synced 2025-01-30 12:31:53 +08:00
linux: Add support for clock_getres64 vDSO
No architecture currently defines the vDSO symbol. On archictures with 64-bit time_t the HAVE_CLOCK_GETRES_VSYSCALL is renamed to HAVE_CLOCK_GETRES64_VSYSCALL, it simplifies clock_gettime code. Reviewed-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
This commit is contained in:
parent
cdae973b6a
commit
0dc1a378b1
@ -160,7 +160,7 @@
|
||||
# endif
|
||||
|
||||
/* List of system calls which are supported as vsyscalls. */
|
||||
# define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres"
|
||||
# define HAVE_CLOCK_GETRES64_VSYSCALL "__kernel_clock_getres"
|
||||
# define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime"
|
||||
# define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday"
|
||||
|
||||
|
@ -30,20 +30,23 @@ __clock_getres64 (clockid_t clock_id, struct __timespec64 *res)
|
||||
{
|
||||
#ifdef __ASSUME_TIME64_SYSCALLS
|
||||
/* 64 bit ABIs or Newer 32-bit ABIs that only support 64-bit time_t. */
|
||||
# ifdef __NR_clock_getres_time64
|
||||
return INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res);
|
||||
# ifndef __NR_clock_getres_time64
|
||||
# define __NR_clock_getres_time64 __NR_clock_getres
|
||||
# endif
|
||||
# ifdef HAVE_CLOCK_GETRES64_VSYSCALL
|
||||
return INLINE_VSYSCALL (clock_getres_time64, 2, clock_id, res);
|
||||
# else
|
||||
# ifdef HAVE_CLOCK_GETRES_VSYSCALL
|
||||
return INLINE_VSYSCALL (clock_getres, 2, clock_id, res);
|
||||
# else
|
||||
return INLINE_SYSCALL_CALL (clock_getres, clock_id, res);
|
||||
# endif
|
||||
return INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res);
|
||||
# endif
|
||||
#else
|
||||
int r;
|
||||
/* Old 32-bit ABI with possible 64-bit time_t support. */
|
||||
# ifdef __NR_clock_getres_time64
|
||||
# ifdef HAVE_CLOCK_GETRES64_VSYSCALL
|
||||
r = INLINE_VSYSCALL (clock_getres_time64, 2, clock_id, res);
|
||||
# else
|
||||
r = INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res);
|
||||
# endif
|
||||
if (r == 0 || errno != ENOSYS)
|
||||
return r;
|
||||
# endif
|
||||
|
@ -62,6 +62,10 @@ PROCINFO_CLASS int (*_dl_vdso_getcpu) (unsigned *, unsigned *, void *) RELRO;
|
||||
PROCINFO_CLASS int (*_dl_vdso_clock_getres) (clockid_t,
|
||||
struct timespec *) RELRO;
|
||||
# endif
|
||||
# ifdef HAVE_CLOCK_GETRES64_VSYSCALL
|
||||
PROCINFO_CLASS int (*_dl_vdso_clock_getres_time64) (clockid_t,
|
||||
struct __timespec64 *) RELRO;
|
||||
# endif
|
||||
|
||||
/* PowerPC specific ones. */
|
||||
# ifdef HAVE_GET_TBFREQ
|
||||
|
@ -41,6 +41,9 @@ setup_vdso_pointers (void)
|
||||
#ifdef HAVE_CLOCK_GETRES_VSYSCALL
|
||||
GLRO(dl_vdso_clock_getres) = dl_vdso_vsym (HAVE_CLOCK_GETRES_VSYSCALL);
|
||||
#endif
|
||||
#ifdef HAVE_CLOCK_GETRES64_VSYSCALL
|
||||
GLRO(dl_vdso_clock_getres_time64) = dl_vdso_vsym (HAVE_CLOCK_GETRES64_VSYSCALL);
|
||||
#endif
|
||||
#ifdef HAVE_GET_TBFREQ
|
||||
GLRO(dl_vdso_get_tbfreq) = dl_vdso_vsym (HAVE_GET_TBFREQ);
|
||||
#endif
|
||||
|
@ -20,10 +20,11 @@
|
||||
#define VDSO_HASH 123718565
|
||||
|
||||
/* List of system calls which are supported as vsyscalls. */
|
||||
#define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres"
|
||||
#if defined(__PPC64__) || defined(__powerpc64__)
|
||||
#define HAVE_CLOCK_GETRES64_VSYSCALL "__kernel_clock_getres"
|
||||
#define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime"
|
||||
#else
|
||||
#define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres"
|
||||
#define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime"
|
||||
#endif
|
||||
#define HAVE_GETCPU_VSYSCALL "__kernel_getcpu"
|
||||
|
@ -125,7 +125,7 @@
|
||||
# define VDSO_HASH 182943605
|
||||
|
||||
/* List of system calls which are supported as vsyscalls. */
|
||||
# define HAVE_CLOCK_GETRES_VSYSCALL "__vdso_clock_getres"
|
||||
# define HAVE_CLOCK_GETRES64_VSYSCALL "__vdso_clock_getres"
|
||||
# define HAVE_CLOCK_GETTIME64_VSYSCALL "__vdso_clock_gettime"
|
||||
# define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday"
|
||||
# define HAVE_GETCPU_VSYSCALL "__vdso_getcpu"
|
||||
|
@ -20,10 +20,11 @@
|
||||
#define VDSO_HASH 123718585
|
||||
|
||||
/* List of system calls which are supported as vsyscalls. */
|
||||
#define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres"
|
||||
#ifdef __s390x__
|
||||
#define HAVE_CLOCK_GETRES64_VSYSCALL "__kernel_clock_getres"
|
||||
#define HAVE_CLOCK_GETTIME64_VSYSCALL "__kernel_clock_gettime"
|
||||
#else
|
||||
#define HAVE_CLOCK_GETRES_VSYSCALL "__kernel_clock_getres"
|
||||
#define HAVE_CLOCK_GETTIME_VSYSCALL "__kernel_clock_gettime"
|
||||
#endif
|
||||
#define HAVE_GETTIMEOFDAY_VSYSCALL "__kernel_gettimeofday"
|
||||
|
@ -368,7 +368,7 @@
|
||||
# define HAVE_GETTIMEOFDAY_VSYSCALL "__vdso_gettimeofday"
|
||||
# define HAVE_TIME_VSYSCALL "__vdso_time"
|
||||
# define HAVE_GETCPU_VSYSCALL "__vdso_getcpu"
|
||||
# define HAVE_CLOCK_GETRES_VSYSCALL "__vdso_clock_getres"
|
||||
# define HAVE_CLOCK_GETRES64_VSYSCALL "__vdso_clock_getres"
|
||||
|
||||
# define SINGLE_THREAD_BY_GLOBAL 1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user