lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-28 00:21:52 +03:00
Code Activity

Linux: Move timer_gettime, __timer_gettime64 from librt to libc

Browse Source 
The symbols were moved using scripts/move-symbol-to-libc.py.

The way the ABI intransition is implemented is changed with this
commit: the implementation is now consolidated in one file with a
TIMER_T_WAS_INT_COMPAT check.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer
2021-06-28 09:51:01 +02:00
parent df6d227e69
commit a1d6ed027b
79 changed files with 153 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
sysdeps/unix/sysv/linux/timer_gettime.c
View File

@ -22,17 +22,19 @@
#include <sysdep.h>
#include <kernel-features.h>
#include "kernel-posix-timers.h"
#include <shlib-compat.h>
#if !TIMER_T_WAS_INT_COMPAT
int
__timer_gettime64 (timer_t timerid, struct __itimerspec64 *value)
___timer_gettime64 (timer_t timerid, struct __itimerspec64 *value)
{
kernel_timer_t ktimerid = timerid_to_kernel_timer (timerid);
#ifndef __NR_timer_gettime64
# define __NR_timer_gettime64 __NR_timer_gettime
#endif
# ifndef __NR_timer_gettime64
# define __NR_timer_gettime64 __NR_timer_gettime
# endif
int ret = INLINE_SYSCALL_CALL (timer_gettime64, ktimerid, value);
#ifndef __ASSUME_TIME64_SYSCALLS
# ifndef __ASSUME_TIME64_SYSCALLS
if (ret == 0 || errno != ENOSYS)
return ret;
@ -43,12 +45,19 @@ __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value)
value->it_interval = valid_timespec_to_timespec64 (its32.it_interval);
value->it_value = valid_timespec_to_timespec64 (its32.it_value);
}
#endif
# endif
return ret;
}
#if __TIMESIZE != 64
librt_hidden_def (__timer_gettime64)
# if __TIMESIZE == 64
versioned_symbol (libc, ___timer_gettime64, timer_gettime, GLIBC_2_34);
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_34)
compat_symbol (librt, ___timer_gettime64, timer_gettime, GLIBC_2_2);
# endif
# else /* __TIMESIZE != 64 */
libc_hidden_ver (___timer_gettime64, __timer_gettime64)
versioned_symbol (libc, ___timer_gettime64, __timer_gettime64, GLIBC_2_34);
int
__timer_gettime (timer_t timerid, struct itimerspec *value)
@ -63,5 +72,39 @@ __timer_gettime (timer_t timerid, struct itimerspec *value)
return retval;
}
#endif
weak_alias (__timer_gettime, timer_gettime)
versioned_symbol (libc, __timer_gettime, timer_gettime, GLIBC_2_34);
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_34)
compat_symbol (librt, __timer_gettime, timer_gettime, GLIBC_2_2);
# endif
# endif /* __TIMESIZE != 64 */
#else /* TIMER_T_WAS_INT_COMPAT */
extern __typeof (timer_gettime) __timer_gettime_new;
libc_hidden_proto (__timer_gettime_new)
int
___timer_gettime_new (timer_t timerid, struct itimerspec *value)
{
kernel_timer_t ktimerid = timerid_to_kernel_timer (timerid);
return INLINE_SYSCALL_CALL (timer_gettime, ktimerid, value);
}
versioned_symbol (libc, ___timer_gettime_new, timer_gettime, GLIBC_2_34);
libc_hidden_ver (___timer_gettime_new, __timer_gettime_new)
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_3_3, GLIBC_2_34)
compat_symbol (librt, ___timer_gettime_new, timer_gettime, GLIBC_2_3_3);
# endif
# if OTHER_SHLIB_COMPAT (librt, GLIBC_2_2, GLIBC_2_3_3)
int
__timer_gettime_old (int timerid, struct itimerspec *value)
{
return __timer_gettime_new (__timer_compat_list[timerid], value);
}
compat_symbol (librt, __timer_gettime_old, timer_gettime, GLIBC_2_2);
# endif
#endif /* TIMER_T_WAS_INT_COMPAT */