From patchwork Thu Nov 12 09:59:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 41029 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 E4F7439F6E79; Thu, 12 Nov 2020 10:00:10 +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 75D6F3858009 for ; Thu, 12 Nov 2020 10:00:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 75D6F3858009 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 4CWxsr6k0Dz1qtdd; Thu, 12 Nov 2020 11:00:00 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CWxsr4QGbz1sCTK; Thu, 12 Nov 2020 11:00:00 +0100 (CET) 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 oBs4mKSTt0LT; Thu, 12 Nov 2020 10:59:58 +0100 (CET) X-Auth-Info: h8716bo2lQkDBHozzw/VuUGB/oBvyr9y3SoFaV2Dj9o= Received: from localhost.localdomain (89-64-5-98.dynamic.chello.pl [89.64.5.98]) (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; Thu, 12 Nov 2020 10:59:58 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Subject: [PATCH v2 1/3] y2038: Convert cnd_timedwait to support 64 bit time Date: Thu, 12 Nov 2020 10:59:33 +0100 Message-Id: <20201112095935.31855-1-lukma@denx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, 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" The cnd_timedwait function has been converted to support 64 bit time. It was also necessary to provide Linux specific copy of it to avoid problems on i686-gnu (i.e. HURD) port, which is not providing pthread_cond_timedwait() supporting 64 bit time. Moreover, a linux specific copy of thrd_priv.h header file has been added as well. The cnd_timedwait is a wrapper on POSIX threads to provide C11 standard threads interface. It directly calls __pthread_cond_timedwait64(). Build tests: ./src/scripts/build-many-glibcs.py glibcs --- Changes for v2: - Create linux specific version of thrd_priv.h Reviewed-by: Alistair Francis --- sysdeps/unix/sysv/linux/cnd_timedwait.c | 44 +++++++++++++++++++++++++ sysdeps/unix/sysv/linux/thrd_priv.h | 27 +++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/cnd_timedwait.c create mode 100644 sysdeps/unix/sysv/linux/thrd_priv.h diff --git a/sysdeps/unix/sysv/linux/cnd_timedwait.c b/sysdeps/unix/sysv/linux/cnd_timedwait.c new file mode 100644 index 0000000000..5bf5a2d968 --- /dev/null +++ b/sysdeps/unix/sysv/linux/cnd_timedwait.c @@ -0,0 +1,44 @@ +/* C11 threads conditional timed wait implementation - Linux variant. + Copyright (C) 2020 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 "thrd_priv.h" + +int +__cnd_timedwait64 (cnd_t *restrict cond, mtx_t *restrict mutex, + const struct __timespec64* restrict time_point) +{ + int err_code = __pthread_cond_timedwait64 ((pthread_cond_t *) cond, + (pthread_mutex_t *) mutex, + time_point); + return thrd_err_map (err_code); +} + +#if __TIMESIZE != 64 +libpthread_hidden_def (__cnd_timedwait64) + +int +__cnd_timedwait (cnd_t *restrict cond, mtx_t *restrict mutex, + const struct timespec* restrict time_point) +{ + struct __timespec64 ts64 = valid_timespec_to_timespec64 (*time_point); + + return __cnd_timedwait64(cond, mutex, &ts64); +} +#endif +weak_alias (__cnd_timedwait, cnd_timedwait) diff --git a/sysdeps/unix/sysv/linux/thrd_priv.h b/sysdeps/unix/sysv/linux/thrd_priv.h new file mode 100644 index 0000000000..5ca0d7a1d9 --- /dev/null +++ b/sysdeps/unix/sysv/linux/thrd_priv.h @@ -0,0 +1,27 @@ +/* Internal C11 threads definitions - linux version + Copyright (C) 2020 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 + +#if __TIMESIZE == 64 +# define __cnd_timedwait64 __cnd_timedwait +#else +extern int __cnd_timedwait64 (cnd_t *restrict cond, mtx_t *restrict mutex, + const struct __timespec64* restrict time_point); +libpthread_hidden_proto (__cnd_timedwait64) +#endif