From patchwork Tue Jul 7 15:08:26 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 39943 X-Patchwork-Delegate: l.majewski@majess.pl Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D9BBE3861960; Tue, 7 Jul 2020 15:09:06 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9]) by sourceware.org (Postfix) with ESMTPS id DF998386192B for ; Tue, 7 Jul 2020 15:09:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org DF998386192B Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 4B1QnW74kYz1qskn; Tue, 7 Jul 2020 17:09:03 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4B1QnW6kKBz1r574; Tue, 7 Jul 2020 17:09:03 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 3Lk7_hq1sHsH; Tue, 7 Jul 2020 17:09:02 +0200 (CEST) X-Auth-Info: dhkyYLRfOYL65zOMwAtDRSvqFNrSvigfpb6Ro1K9cl8= Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 7 Jul 2020 17:09:02 +0200 (CEST) From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Subject: [RFC 09/10] y2038: Convert gai_suspend to support 64 bit timeout Date: Tue, 7 Jul 2020 17:08:26 +0200 Message-Id: <20200707150827.20899-10-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200707150827.20899-1-lukma@denx.de> References: <20200707150827.20899-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-19.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Florian Weimer , GNU C Library , Andreas Schwab , Stepan Golosunov , Alistair Francis Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This patch converts gai_suspend to support 64 bit timeout. It uses internally futex syscall to achieve this goal. --- resolv/gai_misc.h | 7 +++++++ resolv/gai_suspend.c | 33 ++++++++++++++++++++++++++++----- 2 files changed, 35 insertions(+), 5 deletions(-) diff --git a/resolv/gai_misc.h b/resolv/gai_misc.h index 008d6a4ad6..4ac2a24859 100644 --- a/resolv/gai_misc.h +++ b/resolv/gai_misc.h @@ -97,4 +97,11 @@ extern int __gai_notify_only (struct sigevent *sigev, pid_t caller_pid) /* Send the signal. */ extern int __gai_sigqueue (int sig, const union sigval val, pid_t caller_pid); +# if __TIMESIZE == 64 +# define __gai_suspend64 __gai_suspend +# else +extern int __gai_suspend64 (const struct gaicb *const list[], int ent, + const struct __timespec64 *timeout); +libc_hidden_proto (__gai_suspend64) +# endif #endif /* gai_misc.h */ diff --git a/resolv/gai_suspend.c b/resolv/gai_suspend.c index 734f9b4500..79b183681d 100644 --- a/resolv/gai_suspend.c +++ b/resolv/gai_suspend.c @@ -26,8 +26,8 @@ int -gai_suspend (const struct gaicb *const list[], int ent, - const struct timespec *timeout) +__gai_suspend_common (const struct gaicb *const list[], int ent, + const struct __timespec64 *timeout) { struct waitlist waitlist[ent]; struct requestlist *requestlist[ent]; @@ -91,10 +91,10 @@ gai_suspend (const struct gaicb *const list[], int ent, { /* We have to convert the relative timeout value into an absolute time value with pthread_cond_timedwait expects. */ - struct timespec now; - struct timespec abstime; + struct __timespec64 now; + struct __timespec64 abstime; - __clock_gettime (CLOCK_REALTIME, &now); + __clock_gettime64 (CLOCK_REALTIME, &now); abstime.tv_nsec = timeout->tv_nsec + now.tv_nsec; abstime.tv_sec = timeout->tv_sec + now.tv_sec; if (abstime.tv_nsec >= 1000000000) @@ -155,3 +155,26 @@ gai_suspend (const struct gaicb *const list[], int ent, return result; } + +int +__gai_suspend64 (const struct gaicb *const list[], int ent, + const struct __timespec64 *timeout) +{ + return __gai_suspend_common (list, ent, timeout); +} + +#if __TIMESIZE != 64 +libc_hidden_def (__gai_suspend64) + +int +__gai_suspend (const struct gaicb *const list[], int ent, + const struct timespec *timeout) +{ + struct __timespec64 ts64; + if (timeout != NULL) + ts64 = valid_timespec_to_timespec64 (*timeout); + + return __gai_suspend64 (list, ent, timeout != NULL ? &ts64 : NULL); +} +#endif +weak_alias (__gai_suspend, gai_suspend)