From patchwork Thu Sep 7 22:42:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Albert ARIBAUD (3ADEV)" X-Patchwork-Id: 811238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-84355-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="wXX8Key+"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xpFy652Yxz9sDB for ; Fri, 8 Sep 2017 08:49:34 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=x/Ik3exLjr+IXw28f0+ojFvSisRHdVK 2pE4FayVSage84Ji2JY+c2WzHlyg9+MOU3qNrHeKZkHyG1OyxzLGPCaSTG8iHE4w ayzx2u8EUCo6+RsJ9+JWhyvhwj3Y3HkrASWs5yuERH0icDGnPZoMD6dk5Pimq2hx CdUGh1wBczMU= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references; s=default; bh=+UqAh5tZbrt7EYcu9mxGYYlVerU=; b=wXX8K ey+8Jl9j37gbEz+EhQs4Y1lQlkLaKohIaTfGFxlIqx7oJhpXPZYS2d2jzbTaETdO VgH+Px6WrtycuiOQWgsfNyLnL7WAi6rAUQ5g+vRJhU6k+ejGFIcT083JraV4NbUF KRLEZ9lF6vSBREHPyNLvT4BP83LVcjAvehbhTw= Received: (qmail 106294 invoked by alias); 7 Sep 2017 22:45:09 -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 104085 invoked by uid 89); 7 Sep 2017 22:45:06 -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= X-HELO: smtp6-g21.free.fr From: "Albert ARIBAUD (3ADEV)" To: libc-alpha@sourceware.org Cc: "Albert ARIBAUD (3ADEV)" Subject: [RFC PATCH 37/52] Y2038: add function __nanosleep64_t64 Date: Fri, 8 Sep 2017 00:42:04 +0200 Message-Id: <20170907224219.12483-38-albert.aribaud@3adev.fr> In-Reply-To: <20170907224219.12483-37-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> Signed-off-by: Albert ARIBAUD (3ADEV) --- time/Makefile | 2 +- time/Versions | 1 + time/nanosleep64.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 time/nanosleep64.c diff --git a/time/Makefile b/time/Makefile index 5fb26f6dbf..d50c3ddfd8 100644 --- a/time/Makefile +++ b/time/Makefile @@ -37,7 +37,7 @@ routines := offtime asctime clock ctime ctime_r difftime \ getdate strptime strptime_l \ strftime wcsftime strftime_l wcsftime_l \ timespec_get \ - settimeofday64 + settimeofday64 nanosleep64 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 d420770af3..e6812240e9 100644 --- a/time/Versions +++ b/time/Versions @@ -75,5 +75,6 @@ libc { __stime_t64; __gettimeofday_t64; __settimeofday_t64; + __nanosleep_t64; } } diff --git a/time/nanosleep64.c b/time/nanosleep64.c new file mode 100644 index 0000000000..b43b7595eb --- /dev/null +++ b/time/nanosleep64.c @@ -0,0 +1,61 @@ +/* Copyright (C) 1996-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 + +extern int __y2038_linux_support; + +/* Pause execution for a number of nanoseconds. */ +int +__nanosleep_t64 (const struct __timespec64 *requested_time, + struct __timespec64 *remaining) +{ + struct timespec treq32, *treqp32 = NULL; + struct timespec trem32, *tremp32 = NULL; + + if (__y2038_linux_support) + { + /* TODO: use 64-bit time syscalls */ + } + + if (requested_time) + { + if (requested_time->tv_sec > INT_MAX) + { + __set_errno(EOVERFLOW); + return -1; + } + treq32.tv_sec = requested_time->tv_sec; + treq32.tv_nsec = requested_time->tv_nsec; + treqp32 = & treq32; + } + + if (remaining) + tremp32 = &trem32; + + int result = nanosleep(treqp32, tremp32); + + if (result == 1 && errno == EINTR && remaining) + { + remaining->tv_sec = trem32.tv_sec; + remaining->tv_nsec = trem32.tv_nsec; + remaining->tv_pad = 0; + } + + return result; +}