From patchwork Thu Sep 7 22:42:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Albert ARIBAUD X-Patchwork-Id: 22750 Received: (qmail 118885 invoked by alias); 7 Sep 2017 22:45:29 -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 118430 invoked by uid 89); 7 Sep 2017 22:45:28 -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=WHICH X-HELO: smtp6-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [RFC PATCH 42/52] Y2038: add function __setitimer_t64 Date: Fri, 8 Sep 2017 00:42:09 +0200 Message-Id: <20170907224219.12483-43-albert.aribaud@3adev.fr> In-Reply-To: <20170907224219.12483-42-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> <20170907224219.12483-21-albert.aribaud@3adev.fr> <20170907224219.12483-22-albert.aribaud@3adev.fr> <20170907224219.12483-23-albert.aribaud@3adev.fr> <20170907224219.12483-24-albert.aribaud@3adev.fr> <20170907224219.12483-25-albert.aribaud@3adev.fr> <20170907224219.12483-26-albert.aribaud@3adev.fr> <20170907224219.12483-27-albert.aribaud@3adev.fr> <20170907224219.12483-28-albert.aribaud@3adev.fr> <20170907224219.12483-29-albert.aribaud@3adev.fr> <20170907224219.12483-30-albert.aribaud@3adev.fr> <20170907224219.12483-31-albert.aribaud@3adev.fr> <20170907224219.12483-32-albert.aribaud@3adev.fr> <20170907224219.12483-33-albert.aribaud@3adev.fr> <20170907224219.12483-34-albert.aribaud@3adev.fr> <20170907224219.12483-35-albert.aribaud@3adev.fr> <20170907224219.12483-36-albert.aribaud@3adev.fr> <20170907224219.12483-37-albert.aribaud@3adev.fr> <20170907224219.12483-38-albert.aribaud@3adev.fr> <20170907224219.12483-39-albert.aribaud@3adev.fr> <20170907224219.12483-40-albert.aribaud@3adev.fr> <20170907224219.12483-41-albert.aribaud@3adev.fr> <20170907224219.12483-42-albert.aribaud@3adev.fr> Signed-off-by: Albert ARIBAUD (3ADEV) --- time/Makefile | 2 +- time/Versions | 1 + time/setitimer64.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 time/setitimer64.c diff --git a/time/Makefile b/time/Makefile index f2b50626b6..5a36d1274b 100644 --- a/time/Makefile +++ b/time/Makefile @@ -38,7 +38,7 @@ routines := offtime asctime clock ctime ctime_r difftime \ strftime wcsftime strftime_l wcsftime_l \ timespec_get \ settimeofday64 nanosleep64 \ - getitimer64 + getitimer64 setitimer64 aux := era alt_digit lc-time-cleanup tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \ diff --git a/time/Versions b/time/Versions index cc05014bd8..b847718757 100644 --- a/time/Versions +++ b/time/Versions @@ -78,5 +78,6 @@ libc { __nanosleep_t64; __adjtime_t64; __getitimer_t64; + __setitimer_t64; } } diff --git a/time/setitimer64.c b/time/setitimer64.c new file mode 100644 index 0000000000..79cd1ef486 --- /dev/null +++ b/time/setitimer64.c @@ -0,0 +1,69 @@ +/* Copyright (C) 1991-2017 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 +#include + +extern int __y2038_linux_support; + +/* Set the timer WHICH to *NEW. If OLD is not NULL, + set *OLD to the old value of timer WHICH. + Returns 0 on success, -1 on errors. */ +int +__setitimer_t64 (enum __itimer_which which, + const struct __itimerval_t64 *new, + struct __itimerval_t64 *old) +{ + struct itimerval new32, *new32p = NULL; + struct itimerval old32, *old32p = NULL; + + if (__y2038_linux_support) + { + /* TODO: use 64-bit syscall */ + } + + if (new != NULL) + { + if (new->it_interval.tv_sec > INT_MAX || + new->it_value.tv_sec > INT_MAX) + { + __set_errno (EOVERFLOW); + return -1; + } + new32.it_interval.tv_sec = new->it_interval.tv_sec; + new32.it_interval.tv_usec = new->it_interval.tv_usec; + new32.it_value.tv_sec = new->it_value.tv_sec; + new32.it_value.tv_usec = new->it_value.tv_usec; + new32p = &new32; + } + + if (old != NULL) + old32p = &old32; + + int result = setitimer(which, new32p, old32p); + + if (old) + { + old->it_interval.tv_sec = old32.it_interval.tv_sec; + old->it_interval.tv_usec = old32.it_interval.tv_usec; + old->it_value.tv_sec = old32.it_value.tv_sec; + old->it_value.tv_usec = old32.it_value.tv_usec; + } + + return result; +}