From patchwork Wed Apr 18 20:17:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 26797 Received: (qmail 106999 invoked by alias); 18 Apr 2018 20:19: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 106916 invoked by uid 89); 18 Apr 2018 20:19:53 -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, RCVD_IN_DNSWL_LOW, RCVD_IN_RP_RNBL autolearn=ham version=3.3.2 spammy=Until, sk:interna X-HELO: smtp3-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [[PATCH RFC 2] 18/63] Y2038: add function __clock_nanosleep64 Date: Wed, 18 Apr 2018 22:17:34 +0200 Message-Id: <20180418201819.15952-19-albert.aribaud@3adev.fr> In-Reply-To: <20180418201819.15952-18-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> --- include/time.h | 3 +++ sysdeps/unix/sysv/linux/clock_nanosleep.c | 42 ++++++++++++++++++++++++++++++- time/Versions | 1 + 3 files changed, 45 insertions(+), 1 deletion(-) diff --git a/include/time.h b/include/time.h index 37909fae9a..82932f9afd 100644 --- a/include/time.h +++ b/include/time.h @@ -39,6 +39,9 @@ extern int __clock_settime64 (clockid_t __clock_id, const struct __timespec64 *__tp) __THROW; extern int __clock_getres64 (clockid_t __clock_id, struct __timespec64 *__res) __THROW; +extern int __clock_nanosleep64 (clockid_t __clock_id, int __flags, + const struct __timespec64 *__req, + struct __timespec64 *__rem); /* Now define the internal interfaces. */ struct tm; diff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c index 93d5d6ef12..4249ccd3ff 100644 --- a/sysdeps/unix/sysv/linux/clock_nanosleep.c +++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c @@ -21,7 +21,6 @@ #include #include "kernel-posix-cpu-timers.h" - /* We can simply use the syscall. The CPU clocks are not supported with this function. */ int @@ -52,3 +51,44 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req, ? INTERNAL_SYSCALL_ERRNO (r, err) : 0); } weak_alias (__clock_nanosleep, clock_nanosleep) + +/* 64-bit time version */ + +extern int __y2038_linux_support; + +int +__clock_nanosleep64 (clockid_t clock_id, int flags, + const struct __timespec64 *req, + struct __timespec64 *rem) +{ + /* Until Linux provides a 64-bit syscall, use the 32-bit one */ + INTERNAL_SYSCALL_DECL (err); + int r; + struct timespec req32, rem32, *rem32p = NULL; + + if (req == NULL) + { + __set_errno(EFAULT); + return -1; + } + + if (req->tv_sec > INT32_MAX || req->tv_sec < INT32_MIN) + { + __set_errno(EOVERFLOW); + return -1; + } + + req32.tv_sec = req->tv_sec; + req32.tv_nsec = req->tv_nsec; + if (rem !=NULL) rem32p = &rem32; + + r = clock_nanosleep(clock_id, flags, &req32, rem32p); + + if (r == 0 && rem != NULL) + { + rem->tv_sec = rem32.tv_sec; + rem->tv_nsec = rem32.tv_nsec; + } + + return r; +} diff --git a/time/Versions b/time/Versions index 98ac0abfbe..6fe9373913 100644 --- a/time/Versions +++ b/time/Versions @@ -77,5 +77,6 @@ libc { __y2038_kernel_support; __clock_settime64; __clock_getres64; + __clock_nanosleep64; } }