From patchwork Thu Sep 7 22:41:47 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 22728 Received: (qmail 78753 invoked by alias); 7 Sep 2017 22:43:54 -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 78669 invoked by uid 89); 7 Sep 2017 22:43:54 -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=Hx-languages-length:2241 X-HELO: smtp6-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [RFC PATCH 20/52] Y2038: add function __timer_settime64 Date: Fri, 8 Sep 2017 00:41:47 +0200 Message-Id: <20170907224219.12483-21-albert.aribaud@3adev.fr> In-Reply-To: <20170907224219.12483-20-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> Signed-off-by: Albert ARIBAUD (3ADEV) --- rt/Versions | 1 + sysdeps/unix/sysv/linux/timer_settime.c | 49 +++++++++++++++++++++++++++++++++ 2 files changed, 50 insertions(+) diff --git a/rt/Versions b/rt/Versions index f07c8e2b18..4933197aa5 100644 --- a/rt/Versions +++ b/rt/Versions @@ -43,5 +43,6 @@ librt { GLIBC_Y2038 { __timer_gettime64; + __timer_settime64; } } diff --git a/sysdeps/unix/sysv/linux/timer_settime.c b/sysdeps/unix/sysv/linux/timer_settime.c index ba35036355..d75b24ada8 100644 --- a/sysdeps/unix/sysv/linux/timer_settime.c +++ b/sysdeps/unix/sysv/linux/timer_settime.c @@ -41,3 +41,52 @@ timer_settime (timer_t timerid, int flags, const struct itimerspec *value, return res; } + +/* 64-bit time version */ + +int +__timer_settime64 (timer_t timerid, int flags, const struct itimerspec *value, + struct itimerspec *ovalue) +{ + struct timer *kt = (struct timer *) timerid; + struct __itimerspec64 value64; + struct itimerspec value32, 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 (timer_settime64, 4, kt->ktimerid, 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; + + int res = INLINE_SYSCALL (timer_settime, 4, kt->ktimerid, 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; +}