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 From patchwork Thu Nov 12 09:59:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 41030 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 4AE6A39F7C83; Thu, 12 Nov 2020 10:00:11 +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 E8876385803C for ; Thu, 12 Nov 2020 10:00:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org E8876385803C 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 4CWxsv6sLdz1qtdg; Thu, 12 Nov 2020 11:00:03 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CWxsv5GbPz1sCTK; Thu, 12 Nov 2020 11:00:03 +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 VwPhJbOgJWJj; Thu, 12 Nov 2020 11:00:01 +0100 (CET) X-Auth-Info: 0ssPxbQk0mifX2KCZIjSnLrDKX5OVwJEjOxpQNQL9yw= 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 11:00:01 +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: Thu, 12 Nov 2020 10:59:34 +0100 Message-Id: <20201112095935.31855-2-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201112095935.31855-1-lukma@denx.de> References: <20201112095935.31855-1-lukma@denx.de> 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 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 --- Changes for v2: - Add aliasing and __mtx_timedlock64 definition to linux specific version of thrd_priv.h - Add missing space in __mtx_timedlock64 (mutex, &ts64); Reviewed-by: Alistair Francis --- sysdeps/unix/sysv/linux/mtx_timedlock.c | 43 +++++++++++++++++++++++++ sysdeps/unix/sysv/linux/thrd_priv.h | 4 +++ 2 files changed, 47 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/mtx_timedlock.c diff --git a/sysdeps/unix/sysv/linux/mtx_timedlock.c b/sysdeps/unix/sysv/linux/mtx_timedlock.c new file mode 100644 index 0000000000..8dde1d30d4 --- /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) diff --git a/sysdeps/unix/sysv/linux/thrd_priv.h b/sysdeps/unix/sysv/linux/thrd_priv.h index 5ca0d7a1d9..d7851f0986 100644 --- a/sysdeps/unix/sysv/linux/thrd_priv.h +++ b/sysdeps/unix/sysv/linux/thrd_priv.h @@ -20,8 +20,12 @@ #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 From patchwork Thu Nov 12 09:59:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 41031 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 A04AE39F7C87; Thu, 12 Nov 2020 10:00:13 +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 A393639F7C87 for ; Thu, 12 Nov 2020 10:00:11 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A393639F7C87 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 4CWxt01tF0z1s1ym; Thu, 12 Nov 2020 11:00:08 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 4CWxt00WTJz1sCTM; Thu, 12 Nov 2020 11:00:08 +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 wwQirF2zqGFH; Thu, 12 Nov 2020 11:00:04 +0100 (CET) X-Auth-Info: SAfEZ20DfXQT8ZRmShaSpiE1dHwTjfjnxTkHAkYGq/U= 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 11:00:04 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Paul Eggert , Adhemerval Zanella Subject: [PATCH v2 3/3] y2038: Convert thrd_sleep to support 64 bit time Date: Thu, 12 Nov 2020 10:59:35 +0100 Message-Id: <20201112095935.31855-3-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201112095935.31855-1-lukma@denx.de> References: <20201112095935.31855-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-11.9 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 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 --- Changes for v2: - Add aliasing and __thrd_sleep64 definition to linux specific version of thrd_priv.h - Reformat the thrd_sleep.c to not exceed the line width Reviewed-by: Alistair Francis --- sysdeps/unix/sysv/linux/thrd_priv.h | 4 ++ sysdeps/unix/sysv/linux/thrd_sleep.c | 56 ++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 sysdeps/unix/sysv/linux/thrd_sleep.c diff --git a/sysdeps/unix/sysv/linux/thrd_priv.h b/sysdeps/unix/sysv/linux/thrd_priv.h index d7851f0986..3cfb529c2a 100644 --- a/sysdeps/unix/sysv/linux/thrd_priv.h +++ b/sysdeps/unix/sysv/linux/thrd_priv.h @@ -21,6 +21,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); @@ -28,4 +29,7 @@ libpthread_hidden_proto (__cnd_timedwait64) extern int __mtx_timedlock64 (mtx_t *restrict mutex, const struct __timespec64 *restrict time_point); libpthread_hidden_proto (__mtx_timedlock64) +extern int __thrd_sleep64 (const struct __timespec64* time_point, + struct __timespec64* remaining); +libpthread_hidden_proto (__thrd_sleep64) #endif diff --git a/sysdeps/unix/sysv/linux/thrd_sleep.c b/sysdeps/unix/sysv/linux/thrd_sleep.c new file mode 100644 index 0000000000..32dbf2b772 --- /dev/null +++ b/sysdeps/unix/sysv/linux/thrd_sleep.c @@ -0,0 +1,56 @@ +/* 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_nanosleep_time64 (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) +{ + const struct __timespec64 treq64 = valid_timespec_to_timespec64 (*time_point); + struct __timespec64 trem64; + + int ret = __thrd_sleep64 (&treq64, &trem64); + if (ret == -1 && remaining != NULL) + *remaining = valid_timespec64_to_timespec (trem64); + + return ret; +} +#endif +weak_alias (__thrd_sleep, thrd_sleep)