From 57fb15c9e48bcb46659d83cff2754235c81b8bc9 Mon Sep 17 00:00:00 2001 From: "Albert ARIBAUD (3ADEV)" Date: Fri, 8 Sep 2017 00:41:48 +0200 Subject: Y2038: add function __timerfd_gettime64 Note: this tests the return value of function __y2038_kernel_support() rather than the value of variable __y2038_linux_upport, because the latter cannot be accessed from librt while the former can. --- rt/Makefile | 3 +- rt/Versions | 1 + rt/timerfd_gettime64.c | 29 ++++++++++++++++ sysdeps/unix/sysv/linux/timerfd_gettime64.c | 53 +++++++++++++++++++++++++++++ 4 files changed, 85 insertions(+), 1 deletion(-) create mode 100644 rt/timerfd_gettime64.c create mode 100644 sysdeps/unix/sysv/linux/timerfd_gettime64.c 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 4933197aa5..254e36dd2d 100644 --- a/rt/Versions +++ b/rt/Versions @@ -44,5 +44,6 @@ librt { GLIBC_Y2038 { __timer_gettime64; __timer_settime64; + __timerfd_gettime64; } } diff --git a/rt/timerfd_gettime64.c b/rt/timerfd_gettime64.c new file mode 100644 index 0000000000..9209d7c4e7 --- /dev/null +++ b/rt/timerfd_gettime64.c @@ -0,0 +1,29 @@ +/* Get current value of timer TIMERID and store it in VALUE. + + Copyright (C) 2017 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 + . */ + +#include +#include + +int +__timerfd_gettime64 (int fd, struct itimerspec *value) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (__timerfd_gettime64) diff --git a/sysdeps/unix/sysv/linux/timerfd_gettime64.c b/sysdeps/unix/sysv/linux/timerfd_gettime64.c new file mode 100644 index 0000000000..ee814430c9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/timerfd_gettime64.c @@ -0,0 +1,53 @@ +/* Get current value of timer TIMERID and store it in VALUE. + + Copyright (C) 2017 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 . */ + +#include +#include +#include +#include +#include "kernel-posix-timers.h" + +int +__timerfd_gettime64 (int fd, struct __itimerspec64 *value) +{ + int res; + struct itimerspec value32; + +/* Only try and use this syscall if defined by kernel */ +#ifdef __NR_timerfd_gettime64 + if (__y2038_kernel_support()) + { + res = INLINE_SYSCALL (timerfd_gettime64, 2, fd, value); + if (res == 0 || errno != ENOSYS) + return res; + } +#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; +} -- cgit v1.2.1