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);