From patchwork Fri Oct 30 08:38:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 40930 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 344C438708DD; Fri, 30 Oct 2020 08:39:04 +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 [IPv6:2001:a60:0:28:0:1:25:1]) by sourceware.org (Postfix) with ESMTPS id 47F4F3857033 for ; Fri, 30 Oct 2020 08:39:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 47F4F3857033 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 4CMwhK30lHz1rwbT; Fri, 30 Oct 2020 09:38:57 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CMwhK1hx3z1qs0Q; Fri, 30 Oct 2020 09:38:57 +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 vcNJMysb8Uk2; Fri, 30 Oct 2020 09:38:55 +0100 (CET) X-Auth-Info: +q7IA3jvp9UgvRCaZH/j17xxHnZ6r3oCcecu7u2Ygfg= 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; Fri, 30 Oct 2020 09:38:54 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Subject: [PATCH 1/3] y2038: Convert cnd_timedwait to support 64 bit time Date: Fri, 30 Oct 2020 09:38:14 +0100 Message-Id: <20201030083816.32495-1-lukma@denx.de> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-Spam-Status: No, score=-16.2 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, 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. 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 --- nptl/pthreadP.h | 1 + sysdeps/pthread/thrd_priv.h | 8 +++++ sysdeps/unix/sysv/linux/cnd_timedwait.c | 44 +++++++++++++++++++++++++ 3 files changed, 53 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/cnd_timedwait.c diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 710b21e890..b8471e4a5a 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -470,6 +470,7 @@ extern int __pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex); # define __pthread_rwlock_timedwrlock64 __pthread_rwlock_timedwrlock # define __pthread_mutex_clocklock64 __pthread_mutex_clocklock # define __pthread_mutex_timedlock64 __pthread_mutex_timedlock +# define __pthread_mutex_timedlock64 __pthread_mutex_timedlock #else extern int __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return, clockid_t clockid, diff --git a/sysdeps/pthread/thrd_priv.h b/sysdeps/pthread/thrd_priv.h index d22ad6f632..dbfec0df7a 100644 --- a/sysdeps/pthread/thrd_priv.h +++ b/sysdeps/pthread/thrd_priv.h @@ -24,6 +24,14 @@ #include #include "pthreadP.h" /* For pthread_{mutex,cond}_t definitions. */ +#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 + static __always_inline int thrd_err_map (int err_code) { 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) From patchwork Fri Oct 30 08:38:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 40931 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 9324D3870908; Fri, 30 Oct 2020 08:39: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 F34753851C39 for ; Fri, 30 Oct 2020 08:39:02 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org F34753851C39 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 4CMwhM6Sj3z1qs0Y; Fri, 30 Oct 2020 09:38:59 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CMwhM4x8jz1qs0R; Fri, 30 Oct 2020 09:38:59 +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 j-2i00NNbJqo; Fri, 30 Oct 2020 09:38:57 +0100 (CET) X-Auth-Info: 8icpuwBBp5RWtZ3PbtVDxKe427x++e336TZ4nuSd3b8= 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; Fri, 30 Oct 2020 09:38:57 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Subject: [PATCH 2/3] y2038: Convert mtx_timedlock to support 64 bit time Date: Fri, 30 Oct 2020 09:38:15 +0100 Message-Id: <20201030083816.32495-2-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201030083816.32495-1-lukma@denx.de> References: <20201030083816.32495-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-16.2 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 --- 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..7f7e20bf97 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 (__cnd_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) From patchwork Fri Oct 30 08:38:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 40932 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 155913871015; Fri, 30 Oct 2020 08:39:07 +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.10]) by sourceware.org (Postfix) with ESMTPS id 4802A3857033 for ; Fri, 30 Oct 2020 08:39:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 4802A3857033 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 4CMwhQ1WTlz1rwmn; Fri, 30 Oct 2020 09:39:02 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CMwhQ16nlz1qs0Q; Fri, 30 Oct 2020 09:39:02 +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 2HGDxvojiquE; Fri, 30 Oct 2020 09:39:00 +0100 (CET) X-Auth-Info: EjKaiCT+7Bf9sIkruirfGDIhoipg/dNdXHWw/wN9Hq8= 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; Fri, 30 Oct 2020 09:38:59 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Subject: [PATCH 3/3] y2038: Convert thrd_sleep to support 64 bit time Date: Fri, 30 Oct 2020 09:38:16 +0100 Message-Id: <20201030083816.32495-3-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201030083816.32495-1-lukma@denx.de> References: <20201030083816.32495-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-16.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 thrd_sleep 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 clock_nanosleep() supporting 64 bit time. The thrd_sleep is a wrapper on POSIX threads to provide C11 standard threads interface. It directly calls __clock_nanosleep64(). Build tests: ./src/scripts/build-many-glibcs.py glibcs --- sysdeps/pthread/thrd_priv.h | 4 ++ sysdeps/unix/sysv/linux/thrd_sleep.c | 57 ++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/thrd_sleep.c diff --git a/sysdeps/pthread/thrd_priv.h b/sysdeps/pthread/thrd_priv.h index 7f7e20bf97..afce660ed5 100644 --- a/sysdeps/pthread/thrd_priv.h +++ b/sysdeps/pthread/thrd_priv.h @@ -27,6 +27,7 @@ #if __TIMESIZE == 64 # define __cnd_timedwait64 __cnd_timedwait # define __mtx_timedlock64 __mtx_timedlock +# define __thrd_sleep64 __thrd_sleep #else extern int __cnd_timedwait64 (cnd_t *restrict cond, mtx_t *restrict mutex, const struct __timespec64* restrict time_point); @@ -34,6 +35,9 @@ libpthread_hidden_proto (__cnd_timedwait64) extern int __mtx_timedlock64 (mtx_t *restrict mutex, const struct __timespec64 *restrict time_point); libpthread_hidden_proto (__cnd_timedlock64) +extern int __thrd_sleep64 (const struct __timespec64* time_point, + struct __timespec64* remaining); +libpthread_hidden_proto (__thrd_sleep64) #endif static __always_inline int diff --git a/sysdeps/unix/sysv/linux/thrd_sleep.c b/sysdeps/unix/sysv/linux/thrd_sleep.c new file mode 100644 index 0000000000..df4df65067 --- /dev/null +++ b/sysdeps/unix/sysv/linux/thrd_sleep.c @@ -0,0 +1,57 @@ +/* C11 threads thread sleep 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 + +#include "thrd_priv.h" + +int +__thrd_sleep64 (const struct __timespec64* time_point, + struct __timespec64* remaining) +{ + int ret = __clock_nanosleep64 (CLOCK_REALTIME, 0, time_point, remaining); + /* C11 states thrd_sleep function returns -1 if it has been interrupted + by a signal, or a negative value if it fails. */ + switch (ret) + { + case 0: return 0; + case EINTR: return -1; + default: return -2; + } +} + +#if __TIMESIZE != 64 +libpthread_hidden_def (__thrd_sleep64) + +int +__thrd_sleep (const struct timespec* time_point, struct timespec* remaining) +{ + struct __timespec64 treq64, trem64; + int ret; + + treq64 = valid_timespec_to_timespec64 (*time_point); + + ret = __thrd_sleep (&treq64, &trem64); + if (ret == -1 && remaining != NULL) + *remaining = valid_timespec64_to_timespec (trem64); + + return ret; +} +#endif +weak_alias (__thrd_sleep, thrd_sleep)