From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 81075 invoked by alias); 7 Sep 2017 22:44:04 -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 80860 invoked by uid 89); 7 Sep 2017 22:44:03 -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 22/52] Y2038: add function __timerfd_settime64 Date: Thu, 07 Sep 2017 22:44:00 -0000 Message-Id: <20170907224219.12483-23-albert.aribaud@3adev.fr> In-Reply-To: <20170907224219.12483-22-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> <20170907224219.12483-22-albert.aribaud@3adev.fr> X-SW-Source: 2017-09/txt/msg00338.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 | 2 +- rt/Versions | 1 + rt/timerfd_settime64.c | 29 ++++++++++++ sysdeps/unix/sysv/linux/timerfd_settime64.c | 71 +++++++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 rt/timerfd_settime64.c create mode 100644 sysdeps/unix/sysv/linux/timerfd_settime64.c diff --git a/rt/Makefile b/rt/Makefile index 56bfb856ae..2a6be1bcbf 100644 --- a/rt/Makefile +++ b/rt/Makefile @@ -33,7 +33,7 @@ clock-routines := get_clockfreq clock_getcpuclockid \ clock_nanosleep timer-routines := timer_create timer_delete timer_getoverr \ timer_gettime timer_settime \ - timerfd_gettime64 + timerfd_gettime64 timerfd_settime64 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 254e36dd2d..761fbb8a4c 100644 --- a/rt/Versions +++ b/rt/Versions @@ -45,5 +45,6 @@ librt { __timer_gettime64; __timer_settime64; __timerfd_gettime64; + __timerfd_settime64; } } diff --git a/rt/timerfd_settime64.c b/rt/timerfd_settime64.c new file mode 100644 index 0000000000..8551c7adb0 --- /dev/null +++ b/rt/timerfd_settime64.c @@ -0,0 +1,29 @@ +/* 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 + +/* Set timer TIMERID to VALUE, returning old value in OVLAUE. */ +int +__timerfd_settime64 (int fd, int flags, const struct itimerspec *value, + struct itimerspec *ovalue) +{ + __set_errno (ENOSYS); + return -1; +} +stub_warning (__timerfd_settime64) diff --git a/sysdeps/unix/sysv/linux/timerfd_settime64.c b/sysdeps/unix/sysv/linux/timerfd_settime64.c new file mode 100644 index 0000000000..9701452c0a --- /dev/null +++ b/sysdeps/unix/sysv/linux/timerfd_settime64.c @@ -0,0 +1,71 @@ +/* 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_settime64 (int fd, int flags, const struct __itimerspec64 *value, + struct __itimerspec64 *ovalue) +{ + int res; + struct __itimerspec64 value64; + struct itimerspec value32; + struct itimerspec ovalue32; + + if (value == NULL) + return EFAULT; + + if (__y2038_kernel_support()) + { + value64.it_value.tv_sec = value->it_value.tv_sec; + value64.it_value.tv_nsec = value->it_value.tv_nsec; + value64.it_value.tv_pad = 0; + value64.it_interval.tv_sec = value->it_interval.tv_sec; + value64.it_interval.tv_nsec = value->it_interval.tv_nsec; + value64.it_interval.tv_pad = 0; + + return INLINE_SYSCALL (timerfd_settime64, 4, fd, flags, + &value64, ovalue); + } + + if (value->it_value.tv_sec > INT_MAX + || value->it_interval.tv_sec > INT_MAX) + return EOVERFLOW; + + value32.it_value.tv_sec = value->it_value.tv_sec; + value32.it_value.tv_nsec = value->it_value.tv_nsec; + value32.it_interval.tv_sec = value->it_interval.tv_sec; + value32.it_interval.tv_nsec = value->it_interval.tv_nsec; + + res = INLINE_SYSCALL (timerfd_settime, 4, fd, flags, + &value32, &ovalue32); + + if (res == 0 && ovalue != NULL) + { + ovalue->it_value.tv_sec = ovalue32.it_value.tv_sec; + ovalue->it_value.tv_nsec = ovalue32.it_value.tv_nsec; + ovalue->it_interval.tv_sec = ovalue32.it_interval.tv_sec; + ovalue->it_interval.tv_nsec = ovalue32.it_interval.tv_nsec; + } + + return res; +} -- 2.11.0