From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 79877 invoked by alias); 7 Sep 2017 22:43:59 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 79797 invoked by uid 89); 7 Sep 2017 22:43:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.6 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_LAZY_DOMAIN_SECURITY,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 spammy= X-HELO: smtp6-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [RFC PATCH 21/52] Y2038: add function __timerfd_gettime64 Date: Thu, 07 Sep 2017 22:43:00 -0000 Message-Id: <20170907224219.12483-22-albert.aribaud@3adev.fr> In-Reply-To: <20170907224219.12483-21-albert.aribaud@3adev.fr> References: <20170907224219.12483-1-albert.aribaud@3adev.fr> <20170907224219.12483-2-albert.aribaud@3adev.fr> <20170907224219.12483-3-albert.aribaud@3adev.fr> <20170907224219.12483-4-albert.aribaud@3adev.fr> <20170907224219.12483-5-albert.aribaud@3adev.fr> <20170907224219.12483-6-albert.aribaud@3adev.fr> <20170907224219.12483-7-albert.aribaud@3adev.fr> <20170907224219.12483-8-albert.aribaud@3adev.fr> <20170907224219.12483-9-albert.aribaud@3adev.fr> <20170907224219.12483-10-albert.aribaud@3adev.fr> <20170907224219.12483-11-albert.aribaud@3adev.fr> <20170907224219.12483-12-albert.aribaud@3adev.fr> <20170907224219.12483-13-albert.aribaud@3adev.fr> <20170907224219.12483-14-albert.aribaud@3adev.fr> <20170907224219.12483-15-albert.aribaud@3adev.fr> <20170907224219.12483-16-albert.aribaud@3adev.fr> <20170907224219.12483-17-albert.aribaud@3adev.fr> <20170907224219.12483-18-albert.aribaud@3adev.fr> <20170907224219.12483-19-albert.aribaud@3adev.fr> <20170907224219.12483-20-albert.aribaud@3adev.fr> <20170907224219.12483-21-albert.aribaud@3adev.fr> X-SW-Source: 2017-09/txt/msg00337.txt.bz2 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. Signed-off-by: Albert ARIBAUD (3ADEV) --- rt/Makefile | 3 +- rt/Versions | 1 + rt/timerfd_gettime64.c | 28 ++++++++++++++++++ sysdeps/unix/sysv/linux/timerfd_gettime64.c | 44 +++++++++++++++++++++++++++++ 4 files changed, 75 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 9740dc2ad8..56bfb856ae 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..9496fcaef0 --- /dev/null +++ b/rt/timerfd_gettime64.c @@ -0,0 +1,28 @@ +/* Copyright (C) 1999-2016 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 + +/* Get current value of timer TIMERID and store it in VLAUE. */ +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..5843e23c8b --- /dev/null +++ b/sysdeps/unix/sysv/linux/timerfd_gettime64.c @@ -0,0 +1,44 @@ +/* Copyright (C) 2003-2016 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2003. + + 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) +{ + struct itimerspec value32; + + if (__y2038_kernel_support()) + return INLINE_SYSCALL (timerfd_gettime64, 2, fd, value); + + int 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; +} -- 2.11.0