From patchwork Sun Jun 14 16:57:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Samuel Thibault X-Patchwork-Id: 1308988 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ens-lyon.org Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49lLJJ1Zdkz9sRK for ; Mon, 15 Jun 2020 02:58:24 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 44B36395C800; Sun, 14 Jun 2020 16:58:07 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from hera.aquilenet.fr (hera.aquilenet.fr [185.233.100.1]) by sourceware.org (Postfix) with ESMTPS id 0721A388B01D for ; Sun, 14 Jun 2020 16:58:04 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 0721A388B01D 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 0A51933C8; Sun, 14 Jun 2020 18:58:03 +0200 (CEST) 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 HmAd_n3VciM0; Sun, 14 Jun 2020 18:58:01 +0200 (CEST) Received: from function.home (unknown [IPv6:2a01:cb19:956:1b00:9eb6:d0ff:fe88:c3c7]) by hera.aquilenet.fr (Postfix) with ESMTPSA id 3AA6033DC; Sun, 14 Jun 2020 18:57:59 +0200 (CEST) Received: from samy by function.home with local (Exim 4.94) (envelope-from ) id 1jkVxF-00HRMI-6C; Sun, 14 Jun 2020 18:57:57 +0200 From: Samuel Thibault To: libc-alpha@sourceware.org Subject: [hurd,commited 4/6] htl: Fix cleanup support for IO locking Date: Sun, 14 Jun 2020 18:57:55 +0200 Message-Id: <20200614165757.4156687-5-samuel.thibault@ens-lyon.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200614165757.4156687-1-samuel.thibault@ens-lyon.org> References: <20200614165757.4156687-1-samuel.thibault@ens-lyon.org> MIME-Version: 1.0 X-Spam-Status: No, score=-11.4 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" * sysdeps/htl/stdio-lock.h: New file, registers locking cleanup to htl. * sysdeps/htl/libc-lockP.h: Include . (__libc_cleanup_region_start, __libc_cleanup_end, __libc_cleanup_region_end): Override macros from with versions which register cleanup to htl. (__pthread_get_cleanup_stack): Make reference weak for skipping registration on in the static non-libpthread case. --- sysdeps/htl/libc-lockP.h | 33 +++++++++++++++++++++++ sysdeps/htl/stdio-lock.h | 57 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 sysdeps/htl/stdio-lock.h diff --git a/sysdeps/htl/libc-lockP.h b/sysdeps/htl/libc-lockP.h index 4ba3930a13..0c887d707e 100644 --- a/sysdeps/htl/libc-lockP.h +++ b/sysdeps/htl/libc-lockP.h @@ -19,6 +19,7 @@ #ifndef _BITS_LIBC_LOCKP_H #define _BITS_LIBC_LOCKP_H 1 +#include #include #include @@ -73,6 +74,36 @@ typedef pthread_key_t __libc_key_t; __libc_ptf_call (__pthread_setspecific, (KEY, VALUE), 0) +#undef __libc_cleanup_region_start +#undef __libc_cleanup_region_end +#undef __libc_cleanup_end + +#define __libc_cleanup_region_start(DOIT, FCT, ARG) \ + { \ + struct __pthread_cancelation_handler **__handlers = NULL; \ + struct __pthread_cancelation_handler __handler; \ + int _ditit = 0; \ + if (DOIT && __pthread_get_cleanup_stack != NULL) \ + { \ + __handlers = __pthread_get_cleanup_stack (); \ + __handler.__handler = FCT; \ + __handler.__arg = ARG; \ + __handler.__next = *__handlers; \ + *__handlers = &__handler; \ + _ditit = 1; \ + } + +#define __libc_cleanup_end(DOIT) \ + if (_ditit) { \ + if (DOIT) \ + __handler.__handler (__handler.__arg); \ + *__handlers = __handler.__next; \ + } + +#define __libc_cleanup_region_end(DOIT) \ + __libc_cleanup_end(DOIT) \ + } + /* Functions that are used by this file and are internal to the GNU C library. */ @@ -154,6 +185,7 @@ weak_extern (__pthread_once) weak_extern (__pthread_initialize) weak_extern (__pthread_atfork) weak_extern (__pthread_setcancelstate) +weak_extern (__pthread_get_cleanup_stack) # else # pragma weak __pthread_mutex_init # pragma weak __pthread_mutex_destroy @@ -176,6 +208,7 @@ weak_extern (__pthread_setcancelstate) # pragma weak __pthread_initialize # pragma weak __pthread_atfork # pragma weak __pthread_setcancelstate +# pragma weak __pthread_get_cleanup_stack # endif #endif diff --git a/sysdeps/htl/stdio-lock.h b/sysdeps/htl/stdio-lock.h new file mode 100644 index 0000000000..eafd53ad4a --- /dev/null +++ b/sysdeps/htl/stdio-lock.h @@ -0,0 +1,57 @@ +/* Thread package specific definitions of stream lock type. Hurd version. + Copyright (C) 2000-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 + . */ + +#ifndef _STDIO_LOCK_H +#define _STDIO_LOCK_H 1 + +#include + +__libc_lock_define_recursive (typedef, _IO_lock_t) +#define _IO_lock_t_defined 1 + +/* We need recursive (counting) mutexes. */ +# define _IO_lock_initializer _LIBC_LOCK_RECURSIVE_INITIALIZER + +#define _IO_lock_init(_name) __libc_lock_init_recursive (_name) +#define _IO_lock_fini(_name) __libc_lock_fini_recursive (_name) +#define _IO_lock_lock(_name) __libc_lock_lock_recursive (_name) +#define _IO_lock_trylock(_name) __libc_lock_trylock_recursive (_name) +#define _IO_lock_unlock(_name) __libc_lock_unlock_recursive (_name) + + +#define _IO_cleanup_region_start(_fct, _fp) \ + __libc_cleanup_region_start (((_fp)->_flags & _IO_USER_LOCK) == 0, _fct, _fp) +#define _IO_cleanup_region_start_noarg(_fct) \ + __libc_cleanup_region_start (1, _fct, NULL) +#define _IO_cleanup_region_end(_doit) \ + __libc_cleanup_region_end (_doit) + +#if defined _LIBC && IS_IN (libc) + +# define _IO_acquire_lock(_fp) \ + do { \ + _IO_cleanup_region_start((void (*) (void *)) &_IO_funlockfile, _fp); \ + _IO_flockfile (_fp); +# define _IO_release_lock(_fp) \ + _IO_funlockfile (_fp); \ + _IO_cleanup_region_end (0); \ + } while (0) + +#endif + +#endif /* stdio-lock.h */