{"id":811204,"url":"http://patchwork.ozlabs.org/api/patches/811204/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/patch/20170907224219.12483-11-albert.aribaud@3adev.fr/","project":{"id":41,"url":"http://patchwork.ozlabs.org/api/projects/41/?format=json","name":"GNU C Library","link_name":"glibc","list_id":"libc-alpha.sourceware.org","list_email":"libc-alpha@sourceware.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170907224219.12483-11-albert.aribaud@3adev.fr>","list_archive_url":null,"date":"2017-09-07T22:41:37","name":"[RFC,10/52] Y2038: add function __clock_nanosleep64","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"84688748b6752775f0f718a05c45cefbfbc19c62","submitter":{"id":65557,"url":"http://patchwork.ozlabs.org/api/people/65557/?format=json","name":"Albert ARIBAUD (3ADEV)","email":"albert.aribaud@3adev.fr"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/glibc/patch/20170907224219.12483-11-albert.aribaud@3adev.fr/mbox/","series":[{"id":2074,"url":"http://patchwork.ozlabs.org/api/series/2074/?format=json","web_url":"http://patchwork.ozlabs.org/project/glibc/list/?series=2074","date":"2017-09-07T22:41:27","name":"Make GLIBC Y2038-proof","version":1,"mbox":"http://patchwork.ozlabs.org/series/2074/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811204/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811204/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","mailing list libc-alpha@sourceware.org"],"Authentication-Results":["ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=sourceware.org\n\t(client-ip=209.132.180.131; helo=sourceware.org;\n\tenvelope-from=libc-alpha-return-84328-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=)","ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"RZlOdyuh\"; dkim-atps=neutral","sourceware.org; auth=none"],"Received":["from sourceware.org (server1.sourceware.org [209.132.180.131])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xpFrK3Zg1z9sCZ\n\tfor ;\n\tFri, 8 Sep 2017 08:44:33 +1000 (AEST)","(qmail 67233 invoked by alias); 7 Sep 2017 22:43:11 -0000","(qmail 67133 invoked by uid 89); 7 Sep 2017 22:43:11 -0000"],"DomainKey-Signature":"a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references; q=dns; s=default; b=spMV11LOvQwt9Rr8H4bAvx+A9EADG0A\n\te0aQxhcHL6rb8wsFGaitVliMRYuml7dgpyHWy7ChOgZ4J65PatOqyIx5gPR23l18\n\tFdth4LQVMIUpwT3op1jDByzsk5T/Mp0Uk6JuBglZFd4FsxQAnOpnw0Ix1ppZfh7X\n\tpMLbg4+2NHn8=","DKIM-Signature":"v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id\n\t:list-unsubscribe:list-subscribe:list-archive:list-post\n\t:list-help:sender:from:to:cc:subject:date:message-id:in-reply-to\n\t:references; s=default; bh=Y6DXasJiH788yCUFmC+nhFrnACY=; b=RZlOd\n\tyuhGqY2lDa8Ga0VvWS+2Y4Y6U0l7I8ryr9xKLOZzxprQVcvjMXB1RMh/sgUiUrPZ\n\tuXaAElL6MXCzvoMYgZzm0Wc1N+s2bbAbWnD1cf0fxGW3rDJlz3EHz0FJby+8WRZO\n\t7wt61g+W1mIu9vojB7VIayDC61s2eD9YoQESco=","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":",\n\t","Sender":"libc-alpha-owner@sourceware.org","X-Virus-Found":"No","X-Spam-SWARE-Status":"No, score=-26.6 required=5.0 tests=BAYES_00, GIT_PATCH_0,\n\tGIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3,\n\tKAM_LAZY_DOMAIN_SECURITY,\n\tRCVD_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 10/52] Y2038: add function __clock_nanosleep64","Date":"Fri, 8 Sep 2017 00:41:37 +0200","Message-Id":"<20170907224219.12483-11-albert.aribaud@3adev.fr>","In-Reply-To":"<20170907224219.12483-10-albert.aribaud@3adev.fr>","References":"<20170907224219.12483-1-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-2-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-3-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-4-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-5-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-6-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-7-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-8-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-9-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-10-albert.aribaud@3adev.fr>"},"content":"Signed-off-by: Albert ARIBAUD (3ADEV) \n---\n include/time.h | 3 ++\n sysdeps/unix/sysv/linux/arm/Versions | 1 +\n sysdeps/unix/sysv/linux/clock_nanosleep.c | 87 ++++++++++++++++++++++++++++++-\n 3 files changed, 90 insertions(+), 1 deletion(-)","diff":"diff --git a/include/time.h b/include/time.h\nindex 00bdb2853a..90c1385d13 100644\n--- a/include/time.h\n+++ b/include/time.h\n@@ -54,6 +54,9 @@ extern int __clock_settime64 (clockid_t __clock_id,\n \t\t\t const struct __timespec64 *__tp) __THROW;\n extern int __clock_getres64 (clockid_t __clock_id,\n \t\t\t struct __timespec64 *__res) __THROW;\n+extern int __clock_nanosleep64 (clockid_t __clock_id, int __flags,\n+\t\t\t\tconst struct __timespec64 *__req,\n+\t\t\t\tstruct __timespec64 *__rem);\n \n /* Now define the internal interfaces. */\n struct tm;\ndiff --git a/sysdeps/unix/sysv/linux/arm/Versions b/sysdeps/unix/sysv/linux/arm/Versions\nindex 4b03cce526..fd94c63672 100644\n--- a/sysdeps/unix/sysv/linux/arm/Versions\n+++ b/sysdeps/unix/sysv/linux/arm/Versions\n@@ -32,5 +32,6 @@ libc {\n __y2038_kernel_support;\n __clock_settime64;\n __clock_getres64;\n+ __clock_nanosleep64;\n }\n }\ndiff --git a/sysdeps/unix/sysv/linux/clock_nanosleep.c b/sysdeps/unix/sysv/linux/clock_nanosleep.c\nindex 93bc4cf47e..7d00176c3e 100644\n--- a/sysdeps/unix/sysv/linux/clock_nanosleep.c\n+++ b/sysdeps/unix/sysv/linux/clock_nanosleep.c\n@@ -21,7 +21,6 @@\n #include \n #include \"kernel-posix-cpu-timers.h\"\n \n-\n /* We can simply use the syscall. The CPU clocks are not supported\n with this function. */\n int\n@@ -52,3 +51,89 @@ __clock_nanosleep (clockid_t clock_id, int flags, const struct timespec *req,\n \t ? INTERNAL_SYSCALL_ERRNO (r, err) : 0);\n }\n weak_alias (__clock_nanosleep, clock_nanosleep)\n+\n+/* 64-bit time version */\n+\n+extern int __y2038_linux_support;\n+\n+int\n+__clock_nanosleep64 (clockid_t clock_id, int flags,\n+\t\t const struct __timespec64 *req,\n+ struct __timespec64 *rem)\n+{\n+ INTERNAL_SYSCALL_DECL (err);\n+ int r;\n+ struct __timespec64 req64;\n+ struct timespec req32, rem32;\n+\n+ if (clock_id == CLOCK_THREAD_CPUTIME_ID)\n+ return EINVAL;\n+ if (clock_id == CLOCK_PROCESS_CPUTIME_ID)\n+ clock_id = MAKE_PROCESS_CPUCLOCK (0, CPUCLOCK_SCHED);\n+\n+ if (SINGLE_THREAD_P)\n+ {\n+ if (__y2038_linux_support)\n+ {\n+ req64.tv_sec = req->tv_sec;\n+ req64.tv_nsec = req->tv_nsec;\n+ req64.tv_pad = 0;\n+ r = INTERNAL_SYSCALL (clock_nanosleep64, err, 4, clock_id, flags,\n+ &req64, rem);\n+ }\n+ else if (req->tv_sec > INT_MAX)\n+ r = EOVERFLOW;\n+ else\n+ {\n+ req32.tv_sec = req->tv_sec;\n+ req32.tv_nsec = req->tv_nsec;\n+ r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags,\n+ &req32, &rem32);\n+ if (r == EINTR && rem != NULL && flags != TIMER_ABSTIME)\n+ {\n+ rem->tv_sec = rem32.tv_sec;\n+ rem->tv_nsec = rem32.tv_nsec;\n+ rem->tv_pad = 0;\n+ }\n+ }\n+ }\n+ else\n+ {\n+ int oldstate = LIBC_CANCEL_ASYNC ();\n+\n+ if (__y2038_linux_support)\n+ {\n+ req64.tv_sec = req->tv_sec;\n+ req64.tv_nsec = req->tv_nsec;\n+ req64.tv_pad = 0;\n+ r = INTERNAL_SYSCALL (clock_nanosleep64, err, 4, clock_id, flags,\n+ &req64, rem);\n+ }\n+ else if (req->tv_sec > INT_MAX)\n+ r = EOVERFLOW;\n+ else\n+ {\n+ req32.tv_sec = req->tv_sec;\n+ req32.tv_nsec = req->tv_nsec;\n+ r = INTERNAL_SYSCALL (clock_nanosleep, err, 4, clock_id, flags,\n+ &req32, &rem32);\n+ if (r == EINTR && rem != NULL && flags != TIMER_ABSTIME)\n+ {\n+ rem->tv_sec = rem32.tv_sec;\n+ rem->tv_nsec = rem32.tv_nsec;\n+ rem->tv_pad = 0;\n+ }\n+ }\n+ \n+ LIBC_CANCEL_RESET (oldstate);\n+ }\n+\n+ if (INTERNAL_SYSCALL_ERROR_P (r, err))\n+ {\n+ return INTERNAL_SYSCALL_ERRNO (r, err);\n+ }\n+ else\n+ {\n+ return 0;\n+ }\n+}\n","prefixes":["RFC","10/52"]}