From patchwork Wed Apr 18 20:17:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 26809 Received: (qmail 114332 invoked by alias); 18 Apr 2018 20:20:51 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 114256 invoked by uid 89); 18 Apr 2018 20:20:50 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_RP_RNBL autolearn=ham version=3.3.2 spammy= X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [[PATCH RFC 2] 30/63] Y2038: add function __timerfd_settime64 Date: Wed, 18 Apr 2018 22:17:46 +0200 Message-Id: <20180418201819.15952-31-albert.aribaud@3adev.fr> In-Reply-To: <20180418201819.15952-30-albert.aribaud@3adev.fr> References: <20180418201819.15952-1-albert.aribaud@3adev.fr> <20180418201819.15952-2-albert.aribaud@3adev.fr> <20180418201819.15952-3-albert.aribaud@3adev.fr> <20180418201819.15952-4-albert.aribaud@3adev.fr> <20180418201819.15952-5-albert.aribaud@3adev.fr> <20180418201819.15952-6-albert.aribaud@3adev.fr> <20180418201819.15952-7-albert.aribaud@3adev.fr> <20180418201819.15952-8-albert.aribaud@3adev.fr> <20180418201819.15952-9-albert.aribaud@3adev.fr> <20180418201819.15952-10-albert.aribaud@3adev.fr> <20180418201819.15952-11-albert.aribaud@3adev.fr> <20180418201819.15952-12-albert.aribaud@3adev.fr> <20180418201819.15952-13-albert.aribaud@3adev.fr> <20180418201819.15952-14-albert.aribaud@3adev.fr> <20180418201819.15952-15-albert.aribaud@3adev.fr> <20180418201819.15952-16-albert.aribaud@3adev.fr> <20180418201819.15952-17-albert.aribaud@3adev.fr> <20180418201819.15952-18-albert.aribaud@3adev.fr> <20180418201819.15952-19-albert.aribaud@3adev.fr> <20180418201819.15952-20-albert.aribaud@3adev.fr> <20180418201819.15952-21-albert.aribaud@3adev.fr> <20180418201819.15952-22-albert.aribaud@3adev.fr> <20180418201819.15952-23-albert.aribaud@3adev.fr> <20180418201819.15952-24-albert.aribaud@3adev.fr> <20180418201819.15952-25-albert.aribaud@3adev.fr> <20180418201819.15952-26-albert.aribaud@3adev.fr> <20180418201819.15952-27-albert.aribaud@3adev.fr> <20180418201819.15952-28-albert.aribaud@3adev.fr> <20180418201819.15952-29-albert.aribaud@3adev.fr> <20180418201819.15952-30-albert.aribaud@3adev.fr> For Linux this uses the 32-bit time syscal, so it converts syscall input from 64-bit time into 32-bit time and syscall output from 32-bit time to 64-bit time. --- rt/Makefile | 2 +- rt/Versions | 1 + rt/timerfd_settime64.c | 30 +++++++++++ sysdeps/unix/sysv/linux/arm/librt.abilist | 1 + .../sysv/linux/powerpc/powerpc32/librt.abilist | 1 + sysdeps/unix/sysv/linux/timerfd_settime64.c | 61 ++++++++++++++++++++++ 6 files changed, 95 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 c0aad5d8e2..994891e42d 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 ad1e50748a..156df9f647 100644 --- a/rt/Versions +++ b/rt/Versions @@ -41,5 +41,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..39ce88bbf7 --- /dev/null +++ b/rt/timerfd_settime64.c @@ -0,0 +1,30 @@ +/* Set timer TIMERID to VALUE, returning old value in OVALUE. + + 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 + . */ + +#include +#include + +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/arm/librt.abilist b/sysdeps/unix/sysv/linux/arm/librt.abilist index a329b25661..4ca48fc2a6 100644 --- a/sysdeps/unix/sysv/linux/arm/librt.abilist +++ b/sysdeps/unix/sysv/linux/arm/librt.abilist @@ -2,6 +2,7 @@ GLIBC_2.27 GLIBC_2.27 A GLIBC_2.27 __timer_gettime64 F GLIBC_2.27 __timer_settime64 F GLIBC_2.27 __timerfd_gettime64 F +GLIBC_2.27 __timerfd_settime64 F GLIBC_2.4 GLIBC_2.4 A GLIBC_2.4 aio_cancel F GLIBC_2.4 aio_cancel64 F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist index ec80f749ae..1d6dd33e52 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/librt.abilist @@ -33,6 +33,7 @@ GLIBC_2.27 GLIBC_2.27 A GLIBC_2.27 __timer_gettime64 F GLIBC_2.27 __timer_settime64 F GLIBC_2.27 __timerfd_gettime64 F +GLIBC_2.27 __timerfd_settime64 F GLIBC_2.3.4 GLIBC_2.3.4 A GLIBC_2.3.4 mq_close F GLIBC_2.3.4 mq_getattr F diff --git a/sysdeps/unix/sysv/linux/timerfd_settime64.c b/sysdeps/unix/sysv/linux/timerfd_settime64.c new file mode 100644 index 0000000000..4651f7d97e --- /dev/null +++ b/sysdeps/unix/sysv/linux/timerfd_settime64.c @@ -0,0 +1,61 @@ +/* Set timer TIMERID to VALUE, returning old value in OVALUE. + + 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 . */ + +#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 itimerspec value32; + struct itimerspec ovalue32; + + if (value == NULL) + return EFAULT; + + if (value->it_value.tv_sec > INT_MAX + || value->it_interval.tv_sec > INT_MAX) + { + __set_errno(EOVERFLOW); + return -1; + } + + 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; +}