diff options
| -rw-r--r-- | rt/Makefile | 3 | ||||
| -rw-r--r-- | rt/Versions | 1 | ||||
| -rw-r--r-- | rt/timerfd_gettime64.c | 29 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/librt.abilist | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/timerfd_gettime64.c | 54 |
6 files changed, 88 insertions, 1 deletions
diff --git a/rt/Makefile b/rt/Makefile index 6d6b896ee9..c0aad5d8e2 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -32,7 +32,8 @@ clock-routines := get_clockfreq clock_getcpuclockid \ clock_getres clock_gettime clock_settime \ clock_nanosleep timer-routines := timer_create timer_delete timer_getoverr \ - timer_gettime timer_settime + timer_gettime timer_settime \ + timerfd_gettime64 shm-routines := shm_open shm_unlink mq-routines := mq_open mq_close mq_unlink mq_getattr mq_setattr \ mq_notify mq_send mq_receive mq_timedsend \ diff --git a/rt/Versions b/rt/Versions index c8703cbede..7cee85588a 100644 --- a/rt/Versions +++ b/rt/Versions @@ -40,5 +40,6 @@ librt { GLIBC_2.29 { __timer_gettime64; __timer_settime64; + __timerfd_gettime64; } } diff --git a/rt/timerfd_gettime64.c b/rt/timerfd_gettime64.c new file mode 100644 index 0000000000..72d0b68a4a --- /dev/null +++ b/rt/timerfd_gettime64.c @@ -0,0 +1,29 @@ +/* Get current value of timer TIMERID and store it in VALUE. + + Copyright (C) 2018 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 <time.h> + +int +__timerfd_gettime64 (int fd, struct itimerspec *value) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (__timerfd_gettime64) diff --git a/sysdeps/unix/sysv/linux/arm/librt.abilist b/sysdeps/unix/sysv/linux/arm/librt.abilist index b92173e1a9..bcfdc22844 100644 --- a/sysdeps/unix/sysv/linux/arm/librt.abilist +++ b/sysdeps/unix/sysv/linux/arm/librt.abilist @@ -1,5 +1,6 @@ GLIBC_2.29 __timer_gettime64 F GLIBC_2.29 __timer_settime64 F +GLIBC_2.29 __timerfd_gettime64 F GLIBC_2.4 aio_cancel F GLIBC_2.4 aio_cancel64 F GLIBC_2.4 aio_error F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist index e7774eedd4..eabb7609c0 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist @@ -29,6 +29,7 @@ GLIBC_2.2 timer_gettime F GLIBC_2.2 timer_settime F GLIBC_2.29 __timer_gettime64 F GLIBC_2.29 __timer_settime64 F +GLIBC_2.29 __timerfd_gettime64 F GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F GLIBC_2.3.4 mq_notify F diff --git a/sysdeps/unix/sysv/linux/timerfd_gettime64.c b/sysdeps/unix/sysv/linux/timerfd_gettime64.c new file mode 100644 index 0000000000..51be6c725c --- /dev/null +++ b/sysdeps/unix/sysv/linux/timerfd_gettime64.c @@ -0,0 +1,54 @@ +/* Get current value of timer TIMERID and store it in VALUE. + + Copyright (C) 2018 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; see the file COPYING.LIB. If + not, see <http://www.gnu.org/licenses/>. */ + +#include <errno.h> +#include <stdlib.h> +#include <time.h> +#include <sysdep.h> +#include <y2038-support.h> +#include "kernel-posix-timers.h" + +int +__timerfd_gettime64 (int fd, struct __itimerspec64 *value) +{ + int res; + struct itimerspec value32; + +#ifdef __NR_timerfd_gettime64 + if (__y2038_get_kernel_support () > 0) + { + res = INLINE_SYSCALL (timerfd_gettime64, 2, fd, value); + if (res == 0 || errno != ENOSYS) + return res; + __y2038_set_kernel_support (-1); + } +#endif + + res = INLINE_SYSCALL (timerfd_gettime, 2, fd, &value32); + + if (res == 0) + { + value->it_value.tv_sec = value32.it_value.tv_sec; + value->it_value.tv_nsec = value32.it_value.tv_nsec; + value->it_interval.tv_sec = value32.it_interval.tv_sec; + value->it_interval.tv_nsec = value32.it_interval.tv_nsec; + } + + return res; +} |