From patchwork Wed Dec 16 01:51:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 41438 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 C71883857812; Wed, 16 Dec 2020 01:51:52 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from hera.aquilenet.fr (hera.aquilenet.fr [IPv6:2a0c:e300::1]) by sourceware.org (Postfix) with ESMTPS id 9E3353857801 for ; Wed, 16 Dec 2020 01:51:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 9E3353857801 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=samuel.thibault@ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 9E699156A; Wed, 16 Dec 2020 02:51:49 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E0EjTAuYiMBn; Wed, 16 Dec 2020 02:51:48 +0100 (CET) Received: from function.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:956:1b00:9eb6:d0ff:fe88:c3c7]) by hera.aquilenet.fr (Postfix) with ESMTPSA id DA9E51543; Wed, 16 Dec 2020 02:51:47 +0100 (CET) Received: from samy by function.youpi.perso.aquilenet.fr with local (Exim 4.94) (envelope-from ) id 1kpLyk-00H8db-IC; Wed, 16 Dec 2020 02:51:46 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Subject: [PATCH 1/2] pthread: Move semaphore initialization for open to semaphoreP.h Date: Wed, 16 Dec 2020 02:51:42 +0100 Message-Id: <20201216015143.4084732-2-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216015143.4084732-1-samuel.thibault@ens-lyon.org> References: <20201216015143.4084732-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_NEUTRAL, 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: commit-hurd@gnu.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This allows to easily reuse all of the sem_open/sem_close/sem_unlink implementations in the various ports. Reviewed-by: Adhemerval Zanella --- nptl/sem_open.c | 12 +----------- nptl/semaphoreP.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/nptl/sem_open.c b/nptl/sem_open.c index 05e286002b..634bdf7425 100644 --- a/nptl/sem_open.c +++ b/nptl/sem_open.c @@ -211,17 +211,7 @@ sem_open (const char *name, int oflag, ...) struct new_sem newsem; } sem; -#if __HAVE_64B_ATOMICS - sem.newsem.data = value; -#else - sem.newsem.value = value << SEM_VALUE_SHIFT; - sem.newsem.nwaiters = 0; -#endif - /* pad is used as a mutex on pre-v9 sparc and ignored otherwise. */ - sem.newsem.pad = 0; - - /* This always is a shared semaphore. */ - sem.newsem.private = FUTEX_SHARED; + __new_sem_open_init (&sem.newsem, value); /* Initialize the remaining bytes as well. */ memset ((char *) &sem.initsem + sizeof (struct new_sem), '\0', diff --git a/nptl/semaphoreP.h b/nptl/semaphoreP.h index f25ba329d7..2f8757e1f0 100644 --- a/nptl/semaphoreP.h +++ b/nptl/semaphoreP.h @@ -17,6 +17,7 @@ . */ #include +#include #include "pthreadP.h" #define SEM_SHM_PREFIX "sem." @@ -42,6 +43,20 @@ extern int __sem_mappings_lock attribute_hidden; /* Comparison function for search in tree with existing mappings. */ extern int __sem_search (const void *a, const void *b) attribute_hidden; +static inline void __new_sem_open_init (struct new_sem *sem, unsigned value) +{ +#if __HAVE_64B_ATOMICS + sem->data = value; +#else + sem->value = value << SEM_VALUE_SHIFT; + sem->nwaiters = 0; +#endif + /* pad is used as a mutex on pre-v9 sparc and ignored otherwise. */ + sem->pad = 0; + + /* This always is a shared semaphore. */ + sem->private = FUTEX_SHARED; +} /* Prototypes of functions with multiple interfaces. */ extern int __new_sem_init (sem_t *sem, int pshared, unsigned int value); From patchwork Wed Dec 16 01:51:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 41440 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 0AD1F386103E; Wed, 16 Dec 2020 01:51:55 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from hera.aquilenet.fr (hera.aquilenet.fr [IPv6:2a0c:e300::1]) by sourceware.org (Postfix) with ESMTPS id 2A9763860C34 for ; Wed, 16 Dec 2020 01:51:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2A9763860C34 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=samuel.thibault@ens-lyon.org Received: from localhost (localhost [127.0.0.1]) by hera.aquilenet.fr (Postfix) with ESMTP id 4453B1543; Wed, 16 Dec 2020 02:51:50 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at aquilenet.fr Received: from hera.aquilenet.fr ([127.0.0.1]) by localhost (hera.aquilenet.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V3Id_hKy_t0U; Wed, 16 Dec 2020 02:51:48 +0100 (CET) Received: from function.youpi.perso.aquilenet.fr (unknown [IPv6:2a01:cb19:956:1b00:9eb6:d0ff:fe88:c3c7]) by hera.aquilenet.fr (Postfix) with ESMTPSA id B6C1FDE7; Wed, 16 Dec 2020 02:51:47 +0100 (CET) Received: from samy by function.youpi.perso.aquilenet.fr with local (Exim 4.94) (envelope-from ) id 1kpLyk-00H8dd-Jm; Wed, 16 Dec 2020 02:51:46 +0100 From: Samuel Thibault To: libc-alpha@sourceware.org Subject: [PATCH 2/2] htl: Get sem_open/sem_close/sem_unlink support [BZ #25524] Date: Wed, 16 Dec 2020 02:51:43 +0100 Message-Id: <20201216015143.4084732-3-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201216015143.4084732-1-samuel.thibault@ens-lyon.org> References: <20201216015143.4084732-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, JMQ_SPF_NEUTRAL, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_PASS, SPF_NEUTRAL, 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: commit-hurd@gnu.org Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" This just moves the existing nptl implementation to reuse as it is in htl. --- htl/Makefile | 4 +-- htl/semaphoreP.h | 49 ++++++++++++++++++++++++++ sysdeps/htl/sem-close.c | 31 ---------------- sysdeps/htl/sem-open.c | 31 ---------------- sysdeps/htl/sem-unlink.c | 31 ---------------- sysdeps/mach/hurd/i386/Makefile | 7 ---- {nptl => sysdeps/pthread}/sem_close.c | 0 {nptl => sysdeps/pthread}/sem_open.c | 0 {nptl => sysdeps/pthread}/sem_unlink.c | 0 9 files changed, 51 insertions(+), 102 deletions(-) create mode 100644 htl/semaphoreP.h delete mode 100644 sysdeps/htl/sem-close.c delete mode 100644 sysdeps/htl/sem-open.c delete mode 100644 sysdeps/htl/sem-unlink.c rename {nptl => sysdeps/pthread}/sem_close.c (100%) rename {nptl => sysdeps/pthread}/sem_open.c (100%) rename {nptl => sysdeps/pthread}/sem_unlink.c (100%) diff --git a/htl/Makefile b/htl/Makefile index 901deae5f9..7eccd7acf0 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -128,8 +128,8 @@ libpthread-routines := pt-attr pt-attr-destroy pt-attr-getdetachstate \ pt-getschedparam pt-setschedparam pt-setschedprio \ pt-yield \ \ - sem-close sem-destroy sem-getvalue sem-init sem-open \ - sem-post sem-timedwait sem-trywait sem-unlink \ + sem_close sem-destroy sem-getvalue sem-init sem_open \ + sem-post sem-timedwait sem-trywait sem_unlink \ sem-wait sem-waitfast \ \ shm-directory \ diff --git a/htl/semaphoreP.h b/htl/semaphoreP.h new file mode 100644 index 0000000000..22732122b0 --- /dev/null +++ b/htl/semaphoreP.h @@ -0,0 +1,49 @@ +/* Copyright (C) 2002-2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2002. + + 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 "pt-internal.h" + +#define SEM_SHM_PREFIX "sem." + +/* Keeping track of currently used mappings. */ +struct inuse_sem +{ + dev_t dev; + ino_t ino; + int refcnt; + sem_t *sem; + char name[0]; +}; + + +/* The search tree for existing mappings. */ +extern void *__sem_mappings attribute_hidden; + +/* Lock to protect the search tree. */ +extern int __sem_mappings_lock attribute_hidden; + + +/* Comparison function for search in tree with existing mappings. */ +extern int __sem_search (const void *a, const void *b) attribute_hidden; + +static inline void __new_sem_open_init (struct new_sem *sem, unsigned value) +{ + /* This always is a shared semaphore. */ + *sem = (struct new_sem) __SEMAPHORE_INITIALIZER (1, value); +} diff --git a/sysdeps/htl/sem-close.c b/sysdeps/htl/sem-close.c deleted file mode 100644 index e568758532..0000000000 --- a/sysdeps/htl/sem-close.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Close a named semaphore. Generic version. - Copyright (C) 2005-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 - -int -__sem_close (sem_t *sem) -{ - errno = EOPNOTSUPP; - return -1; -} - -strong_alias (__sem_close, sem_close); diff --git a/sysdeps/htl/sem-open.c b/sysdeps/htl/sem-open.c deleted file mode 100644 index 682f0e1a88..0000000000 --- a/sysdeps/htl/sem-open.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Open a named semaphore. Generic version. - Copyright (C) 2005-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 - -sem_t * -__sem_open (const char *name, int open_flags, ...) -{ - errno = ENOSYS; - return SEM_FAILED; -} - -strong_alias (__sem_open, sem_open); diff --git a/sysdeps/htl/sem-unlink.c b/sysdeps/htl/sem-unlink.c deleted file mode 100644 index c92c8317b1..0000000000 --- a/sysdeps/htl/sem-unlink.c +++ /dev/null @@ -1,31 +0,0 @@ -/* Unlink a named semaphore. Generic version. - Copyright (C) 2005-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 - -int -__sem_unlink (const char *name) -{ - errno = EOPNOTSUPP; - return -1; -} - -strong_alias (__sem_unlink, sem_unlink); diff --git a/sysdeps/mach/hurd/i386/Makefile b/sysdeps/mach/hurd/i386/Makefile index d056e06278..7400ea98cc 100644 --- a/sysdeps/mach/hurd/i386/Makefile +++ b/sysdeps/mach/hurd/i386/Makefile @@ -129,13 +129,6 @@ test-xfail-tst-signal2 = yes test-xfail-tst-cond24 = yes test-xfail-tst-cond25 = yes -# For bug 25524 -# (sem_open support) -test-xfail-tst-sem4 = yes -test-xfail-tst-sem7 = yes -test-xfail-tst-sem8 = yes -test-xfail-tst-sem9 = yes - # For bug 25563 # (robust support against dead threads) test-xfail-tst-robust1 = yes diff --git a/nptl/sem_close.c b/sysdeps/pthread/sem_close.c similarity index 100% rename from nptl/sem_close.c rename to sysdeps/pthread/sem_close.c diff --git a/nptl/sem_open.c b/sysdeps/pthread/sem_open.c similarity index 100% rename from nptl/sem_open.c rename to sysdeps/pthread/sem_open.c diff --git a/nptl/sem_unlink.c b/sysdeps/pthread/sem_unlink.c similarity index 100% rename from nptl/sem_unlink.c rename to sysdeps/pthread/sem_unlink.c