From patchwork Tue Nov 3 09:14:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 40949 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 170813982EFD; Tue, 3 Nov 2020 09:15:40 +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 EB04D385802E for ; Tue, 3 Nov 2020 09:15:37 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org EB04D385802E 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 4CQPJn0VfTz1qskd; Tue, 3 Nov 2020 10:15:37 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CQPJm6J9Kz1qsXX; Tue, 3 Nov 2020 10:15:36 +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 H56t8L-tfsAF; Tue, 3 Nov 2020 10:15:34 +0100 (CET) X-Auth-Info: oovQsNMAe9M8bytF7TQH02X4sTdnuGRjKYwPmauWe2Y= 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, 3 Nov 2020 10:15:34 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Subject: [PATCH v2 2/3] y2038: Convert mtx_timedlock to support 64 bit time Date: Tue, 3 Nov 2020 10:14:48 +0100 Message-Id: <20201103091449.20364-2-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201103091449.20364-1-lukma@denx.de> References: <20201103091449.20364-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-16.0 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 mtx_timedlock 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_mutex_timedlock() supporting 64 bit time. The mtx_timedlock is a wrapper on POSIX threads to provide C11 standard threads interface. It directly calls __pthread_mutex_timedlock64(). Build tests: ./src/scripts/build-many-glibcs.py glibcs Reviewed-by: Alistair Francis --- sysdeps/pthread/thrd_priv.h | 4 +++ sysdeps/unix/sysv/linux/mtx_timedlock.c | 43 +++++++++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/mtx_timedlock.c diff --git a/sysdeps/pthread/thrd_priv.h b/sysdeps/pthread/thrd_priv.h index dbfec0df7a..efe453bdec 100644 --- a/sysdeps/pthread/thrd_priv.h +++ b/sysdeps/pthread/thrd_priv.h @@ -26,10 +26,14 @@ #if __TIMESIZE == 64 # define __cnd_timedwait64 __cnd_timedwait +# define __mtx_timedlock64 __mtx_timedlock #else extern int __cnd_timedwait64 (cnd_t *restrict cond, mtx_t *restrict mutex, const struct __timespec64* restrict time_point); libpthread_hidden_proto (__cnd_timedwait64) +extern int __mtx_timedlock64 (mtx_t *restrict mutex, + const struct __timespec64 *restrict time_point); +libpthread_hidden_proto (__mtx_timedlock64) #endif static __always_inline int diff --git a/sysdeps/unix/sysv/linux/mtx_timedlock.c b/sysdeps/unix/sysv/linux/mtx_timedlock.c new file mode 100644 index 0000000000..ef57dd1e41 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mtx_timedlock.c @@ -0,0 +1,43 @@ +/* C11 threads mutex timed lock 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 +__mtx_timedlock64 (mtx_t *restrict mutex, + const struct __timespec64 *restrict time_point) +{ + int err_code = __pthread_mutex_timedlock64 ((pthread_mutex_t *)mutex, + time_point); + return thrd_err_map (err_code); +} + +#if __TIMESIZE != 64 +libpthread_hidden_def (__mtx_timedlock64) + +int +__mtx_timedlock (mtx_t *restrict mutex, + const struct timespec *restrict time_point) +{ + struct __timespec64 ts64 = valid_timespec_to_timespec64 (*time_point); + + return __mtx_timedlock64(mutex, &ts64); +} +#endif +weak_alias (__mtx_timedlock, mtx_timedlock)