mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-23 13:30:06 +00:00
0334369949
During the conversion to support 64 bit time on some architectures with __WORDSIZE == 32 && __TIMESIZE != 64 the libc_hidden_def attribute for eligible functions was by mistake omitted. This patch fixes this issue and exports (and allows using) those functions when Y2038 support is enabled in glibc.
109 lines
3.2 KiB
C
109 lines
3.2 KiB
C
/* clock_gettime -- Get current time from a POSIX clockid_t. Linux version.
|
|
Copyright (C) 2003-2020 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
|
|
<https://www.gnu.org/licenses/>. */
|
|
|
|
#include <sysdep.h>
|
|
#include <kernel-features.h>
|
|
#include <errno.h>
|
|
#include <time.h>
|
|
#include "kernel-posix-cpu-timers.h"
|
|
#include <sysdep-vdso.h>
|
|
|
|
#include <shlib-compat.h>
|
|
|
|
/* Get current value of CLOCK and store it in TP. */
|
|
int
|
|
__clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp)
|
|
{
|
|
#ifdef __ASSUME_TIME64_SYSCALLS
|
|
/* 64 bit ABIs or newer 32-bit ABIs that only support 64-bit time_t. */
|
|
# ifndef __NR_clock_gettime64
|
|
# define __NR_clock_gettime64 __NR_clock_gettime
|
|
# endif
|
|
# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
|
|
return INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp);
|
|
# else
|
|
return INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
|
|
# endif
|
|
#else
|
|
int r;
|
|
/* Old 32-bit ABI with possible 64-bit time_t support. */
|
|
# ifdef __NR_clock_gettime64
|
|
/* Avoid issue a __NR_clock_gettime64 syscall on kernels that do not
|
|
support 64-bit time_t. */
|
|
static int time64_support = 1;
|
|
if (atomic_load_relaxed (&time64_support) != 0)
|
|
{
|
|
# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
|
|
r = INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp);
|
|
# else
|
|
r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
|
|
# endif
|
|
if (r == 0 || errno != ENOSYS)
|
|
return r;
|
|
|
|
atomic_store_relaxed (&time64_support, 0);
|
|
}
|
|
# endif
|
|
/* Fallback code that uses 32-bit support. */
|
|
struct timespec tp32;
|
|
# ifdef HAVE_CLOCK_GETTIME_VSYSCALL
|
|
r = INLINE_VSYSCALL (clock_gettime, 2, clock_id, &tp32);
|
|
# else
|
|
r = INLINE_SYSCALL_CALL (clock_gettime, clock_id, &tp32);
|
|
# endif
|
|
if (r == 0)
|
|
*tp = valid_timespec_to_timespec64 (tp32);
|
|
return r;
|
|
#endif
|
|
}
|
|
|
|
#if __TIMESIZE != 64
|
|
libc_hidden_def (__clock_gettime64)
|
|
|
|
int
|
|
__clock_gettime (clockid_t clock_id, struct timespec *tp)
|
|
{
|
|
int ret;
|
|
struct __timespec64 tp64;
|
|
|
|
ret = __clock_gettime64 (clock_id, &tp64);
|
|
|
|
if (ret == 0)
|
|
{
|
|
if (! in_time_t_range (tp64.tv_sec))
|
|
{
|
|
__set_errno (EOVERFLOW);
|
|
return -1;
|
|
}
|
|
|
|
*tp = valid_timespec64_to_timespec (tp64);
|
|
}
|
|
|
|
return ret;
|
|
}
|
|
#endif
|
|
libc_hidden_def (__clock_gettime)
|
|
|
|
versioned_symbol (libc, __clock_gettime, clock_gettime, GLIBC_2_17);
|
|
/* clock_gettime moved to libc in version 2.17;
|
|
old binaries may expect the symbol version it had in librt. */
|
|
#if SHLIB_COMPAT (libc, GLIBC_2_2, GLIBC_2_17)
|
|
strong_alias (__clock_gettime, __clock_gettime_2);
|
|
compat_symbol (libc, __clock_gettime_2, clock_gettime, GLIBC_2_2);
|
|
#endif
|