Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/811252/?format=api
{ "id": 811252, "url": "http://patchwork.ozlabs.org/api/patches/811252/?format=api", "web_url": "http://patchwork.ozlabs.org/project/glibc/patch/20170907224219.12483-49-albert.aribaud@3adev.fr/", "project": { "id": 41, "url": "http://patchwork.ozlabs.org/api/projects/41/?format=api", "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-49-albert.aribaud@3adev.fr>", "list_archive_url": null, "date": "2017-09-07T22:42:15", "name": "[RFC,48/52] Y2038: add function __adjtimex_t64 (and __ntp_adjtime_t64)", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "9007e2cbfe237f69d57037f6c00db45ebc378dbf", "submitter": { "id": 65557, "url": "http://patchwork.ozlabs.org/api/people/65557/?format=api", "name": "Albert ARIBAUD (3ADEV)", "email": "albert.aribaud@3adev.fr" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/glibc/patch/20170907224219.12483-49-albert.aribaud@3adev.fr/mbox/", "series": [ { "id": 2074, "url": "http://patchwork.ozlabs.org/api/series/2074/?format=api", "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/811252/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/811252/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<libc-alpha-return-84366-incoming=patchwork.ozlabs.org@sourceware.org>", "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-84366-incoming=patchwork.ozlabs.org@sourceware.org;\n\treceiver=<UNKNOWN>)", "ozlabs.org; dkim=pass (1024-bit key;\n\tsecure) header.d=sourceware.org header.i=@sourceware.org\n\theader.b=\"cOI/bD3H\"; 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 3xpG0j6l09z9rxl\n\tfor <incoming@patchwork.ozlabs.org>;\n\tFri, 8 Sep 2017 08:51:49 +1000 (AEST)", "(qmail 330 invoked by alias); 7 Sep 2017 22:45:55 -0000", "(qmail 126856 invoked by uid 89); 7 Sep 2017 22:45:47 -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=utakqItoQVmrrEqbfEK/QUCurAe0Gvx\n\toHD5zASJPPQ0AKEO58UGAItVA6p//aAfqU6g0+WTpj7xdozyTC3pjsAxAi0oSm7g\n\tzwYlWDI3df9bDl4leBoBUqTEq5tA+8x2q07MU53NNG8I8Y0ZENsFhi2vvc+vY2Or\n\tnE0gPmwGjVrk=", "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=Yueyw8QPSTArt0AlToytbm4c9PQ=; b=cOI/b\n\tD3HJr9rlINXZF73su5lcphZpHhJAyjauHwROdLJNnYU3JocaR24yrjEoKkLbzglb\n\txD5umG2/QGJJBJa5YP2/JvM0u3XVz7dET1LEYCIaZ2Nx9KOny7UFxTIxmItWmlIF\n\tQ/wFcmAWpaqblZwEP/4Kw1ikQ0yfOSrt+GZXvY=", "Mailing-List": "contact libc-alpha-help@sourceware.org; run by ezmlm", "Precedence": "bulk", "List-Id": "<libc-alpha.sourceware.org>", "List-Unsubscribe": "<mailto:libc-alpha-unsubscribe-incoming=patchwork.ozlabs.org@sourceware.org>", "List-Subscribe": "<mailto:libc-alpha-subscribe@sourceware.org>", "List-Archive": "<http://sourceware.org/ml/libc-alpha/>", "List-Post": "<mailto:libc-alpha@sourceware.org>", "List-Help": "<mailto:libc-alpha-help@sourceware.org>,\n\t<http://sourceware.org/ml/#faqs>", "Sender": "libc-alpha-owner@sourceware.org", "X-Virus-Found": "No", "X-HELO": "smtp6-g21.free.fr", "From": "\"Albert ARIBAUD (3ADEV)\" <albert.aribaud@3adev.fr>", "To": "libc-alpha@sourceware.org", "Cc": "\"Albert ARIBAUD (3ADEV)\" <albert.aribaud@3adev.fr>", "Subject": "[RFC PATCH 48/52] Y2038: add function __adjtimex_t64 (and\n\t__ntp_adjtime_t64)", "Date": "Fri, 8 Sep 2017 00:42:15 +0200", "Message-Id": "<20170907224219.12483-49-albert.aribaud@3adev.fr>", "In-Reply-To": "<20170907224219.12483-48-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>\n\t<20170907224219.12483-11-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-12-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-13-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-14-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-15-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-16-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-17-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-18-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-19-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-20-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-21-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-22-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-23-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-24-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-25-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-26-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-27-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-28-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-29-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-30-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-31-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-32-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-33-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-34-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-35-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-36-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-37-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-38-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-39-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-40-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-41-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-42-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-43-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-44-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-45-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-46-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-47-albert.aribaud@3adev.fr>\n\t<20170907224219.12483-48-albert.aribaud@3adev.fr>" }, "content": "Signed-off-by: Albert ARIBAUD (3ADEV) <albert.aribaud@3adev.fr>\n---\n include/time.h | 31 +++++++++++++++\n sysdeps/unix/sysv/linux/adjtime.c | 81 +++++++++++++++++++++++++++++++++++++++\n time/Versions | 1 +\n 3 files changed, 113 insertions(+)", "diff": "diff --git a/include/time.h b/include/time.h\nindex 5db1d44470..1914c20a75 100644\n--- a/include/time.h\n+++ b/include/time.h\n@@ -72,6 +72,37 @@ struct __ntptimeval_t64\n long int __glibc_reserved4;\n };\n \n+/* 64-bit time version of the current struct timex */\n+struct __timex_t64\n+{\n+ unsigned int modes;\t\t/* mode selector */\n+ __syscall_slong_t offset;\t/* time offset (usec) */\n+ __syscall_slong_t freq;\t/* frequency offset (scaled ppm) */\n+ __syscall_slong_t maxerror;\t/* maximum error (usec) */\n+ __syscall_slong_t esterror;\t/* estimated error (usec) */\n+ int status;\t\t\t/* clock command/status */\n+ __syscall_slong_t constant;\t/* pll time constant */\n+ __syscall_slong_t precision;\t/* clock precision (usec) (ro) */\n+ __syscall_slong_t tolerance;\t/* clock frequency tolerance (ppm) (ro) */\n+ struct __timeval64 time;\t/* (read only, except for ADJ_SETOFFSET) */\n+ __syscall_slong_t tick;\t/* (modified) usecs between clock ticks */\n+ __syscall_slong_t ppsfreq;\t/* pps frequency (scaled ppm) (ro) */\n+ __syscall_slong_t jitter;\t/* pps jitter (us) (ro) */\n+ int shift;\t\t\t/* interval duration (s) (shift) (ro) */\n+ __syscall_slong_t stabil;\t/* pps stability (scaled ppm) (ro) */\n+ __syscall_slong_t jitcnt;\t/* jitter limit exceeded (ro) */\n+ __syscall_slong_t calcnt;\t/* calibration intervals (ro) */\n+ __syscall_slong_t errcnt;\t/* calibration errors (ro) */\n+ __syscall_slong_t stbcnt;\t/* stability limit exceeded (ro) */\n+\n+ int tai;\t\t\t/* TAI offset (ro) */\n+\n+ /* ??? */\n+ int :32; int :32; int :32; int :32;\n+ int :32; int :32; int :32; int :32;\n+ int :32; int :32; int :32;\n+};\n+\n extern __typeof (clock_getres) __clock_getres;\n extern __typeof (clock_gettime) __clock_gettime;\n libc_hidden_proto (__clock_gettime)\ndiff --git a/sysdeps/unix/sysv/linux/adjtime.c b/sysdeps/unix/sysv/linux/adjtime.c\nindex 28a75a2e40..60211a5223 100644\n--- a/sysdeps/unix/sysv/linux/adjtime.c\n+++ b/sysdeps/unix/sysv/linux/adjtime.c\n@@ -19,6 +19,7 @@\n #include <limits.h>\n #include <sys/time.h>\n #include <sys/timex.h>\n+#include <include/time.h>\n \n #define MAX_SEC\t(INT_MAX / 1000000L - 2)\n #define MIN_SEC\t(INT_MIN / 1000000L + 2)\n@@ -133,3 +134,83 @@ int __adjtime_t64 (const struct __timeval64 *itv,\n }\n return 0;\n }\n+\n+int\n+__adjtimex_t64(struct __timex_t64 *tx)\n+{\n+ struct timex tx32;\n+\n+ if (__y2038_linux_support)\n+ {\n+ /* TODO: implement with a 64-bit time syscall */\n+ }\n+\n+ if (tx == NULL)\n+ {\n+ __set_errno (EFAULT);\n+ return -1;\n+ }\n+\n+ if ((tx->modes & ADJ_SETOFFSET) != 0 && tx->time.tv_sec > INT_MAX)\n+ {\n+ __set_errno (EOVERFLOW);\n+ return -1;\n+ }\n+\n+ /* Implement with existing 32-bit time syscall */\n+\n+ /* Just copy everything */\n+ tx32.modes = tx->modes;\n+ tx32.offset = tx->offset;\n+ tx32.freq = tx->freq;\n+ tx32.maxerror = tx->maxerror;\n+ tx32.esterror = tx->esterror;\n+ tx32.status = tx->status;\n+ tx32.constant = tx->constant;\n+ tx32.precision = tx->precision;\n+ tx32.tolerance = tx->tolerance;\n+ tx32.time.tv_sec = tx->time.tv_sec;\n+ tx32.time.tv_usec = tx->time.tv_usec;\n+ tx32.tick = tx->tick;\n+ tx32.ppsfreq = tx->ppsfreq;\n+ tx32.jitter = tx->jitter;\n+ tx32.shift = tx->shift;\n+ tx32.stabil = tx->stabil;\n+ tx32.jitcnt = tx->jitcnt;\n+ tx32.calcnt = tx->calcnt;\n+ tx32.errcnt = tx->errcnt;\n+ tx32.stbcnt = tx->stbcnt;\n+\n+ tx32.tai = tx->tai;\n+ /* WARNING -- anonymous fields after TAI are not copied. */\n+\n+ int result = ADJTIMEX(&tx32);\n+\n+ if (result == 0)\n+ {\n+ /* Just copy back everything */\n+ tx->modes = tx32.modes;\n+ tx->offset = tx32.offset;\n+ tx->freq = tx32.freq;\n+ tx->maxerror = tx32.maxerror;\n+ tx->esterror = tx32.esterror;\n+ tx->status = tx32.status;\n+ tx->constant = tx32.constant;\n+ tx->precision = tx32.precision;\n+ tx->tolerance = tx32.tolerance;\n+ tx->time.tv_sec = tx32.time.tv_sec;\n+ tx->time.tv_usec = tx32.time.tv_usec;\n+ tx->tick = tx32.tick;\n+ tx->ppsfreq = tx32.ppsfreq;\n+ tx->jitter = tx32.jitter;\n+ tx->shift = tx32.shift;\n+ tx->stabil = tx32.stabil;\n+ tx->jitcnt = tx32.jitcnt;\n+ tx->calcnt = tx32.calcnt;\n+ tx->errcnt = tx32.errcnt;\n+ tx->stbcnt = tx32.stbcnt;\n+ }\n+\n+ return result;\n+}\n+weak_alias (__adjtimex_t64, __ntp_adjtime_t64);\ndiff --git a/time/Versions b/time/Versions\nindex b847718757..9e23793cfb 100644\n--- a/time/Versions\n+++ b/time/Versions\n@@ -79,5 +79,6 @@ libc {\n __adjtime_t64;\n __getitimer_t64;\n __setitimer_t64;\n+ __adjtimex_t64;\n }\n }\n", "prefixes": [ "RFC", "48/52" ] }