From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by sourceware.org (Postfix) with ESMTPS id A80053858C62 for ; Wed, 4 Jan 2023 08:49:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A80053858C62 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=disroot.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=disroot.org Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id A8DE040E08 for ; Wed, 4 Jan 2023 09:49:21 +0100 (CET) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Hw2_dLl2_EbT for ; Wed, 4 Jan 2023 09:49:20 +0100 (CET) From: Guy-Fleury Iteriteka DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1672822160; bh=kXNYxl9EjTNKRPTfuynowyB+pCrzsxmTPnouJMxhoXc=; h=From:To:Subject:Date:In-Reply-To:References; b=JBZaqzo8NjuHbGp04M9Q19aZy59qvmX+jiHTh9U4xGu6Sg121d64iQHvN7n9VgtIu iGwdOtLOL2BlLn9vnwFeZLbwnee7bHaHSJtcsmO7pqNhkfiYs88duvHRHu2ntd/lDC 9OppDddZBUcm2JT+Gi/NvcxnE5mayihr0JRnj5e5hvu4qg1rYYDiqxB3eNPLh5n9P4 MrCERXaLrqeL2VBEQI1RPJ1iapjkt53hlcnSSF6mtwveyz+OTPq+NJrq+nNhPx6eBM uU1VMWiAB2YZwnT8IgKlUZBcjGCW4hNcS8F49lX6++1pjRMFFH17fUt6COSHBZPlSO WjRs94D0fKfiw== To: libc-alpha@sourceware.org Subject: [PATCH v2 1/3] htl: move __pthtread_total into libc Date: Wed, 4 Jan 2023 10:49:13 +0200 Message-Id: <20230104084915.646092-2-gfleury@disroot.org> In-Reply-To: <20230104084915.646092-1-gfleury@disroot.org> References: <20230104084915.646092-1-gfleury@disroot.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,KAM_SHORT,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: htl/pt-nthreads.c: new file. htl/Makefile: Add it to routine. htl/Versions: version it as private libc symbol. htl/pt-create.c: remove his definition here. htl/pt-internal.h: add propertie to it declaration. --- htl/Makefile | 2 +- htl/Versions | 1 + htl/pt-create.c | 6 ------ htl/pt-internal.h | 1 + htl/pt-nthreads.c | 23 +++++++++++++++++++++++ 5 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 htl/pt-nthreads.c diff --git a/htl/Makefile b/htl/Makefile index 0b403e2f..61944148 100644 --- a/htl/Makefile +++ b/htl/Makefile @@ -164,7 +164,7 @@ headers := \ distribute := -routines := forward libc_pthread_init alloca_cutoff htlfreeres +routines := forward libc_pthread_init alloca_cutoff htlfreeres pt-nthreads shared-only-routines = forward extra-libs := libpthread diff --git a/htl/Versions b/htl/Versions index 4e0ebac2..113110f4 100644 --- a/htl/Versions +++ b/htl/Versions @@ -30,6 +30,7 @@ libc { __libc_alloca_cutoff; __libc_pthread_init; __pthread_cleanup_stack; + __pthread_total; } } diff --git a/htl/pt-create.c b/htl/pt-create.c index 5d37edbb..34a63b6a 100644 --- a/htl/pt-create.c +++ b/htl/pt-create.c @@ -36,12 +36,6 @@ # include #endif -/* The total number of pthreads currently active. This is defined - here since it would be really stupid to have a threads-using - program that doesn't call `pthread_create'. */ -unsigned int __pthread_total; - - /* The entry-point for new threads. */ static void entry_point (struct __pthread *self, void *(*start_routine) (void *), void *arg) diff --git a/htl/pt-internal.h b/htl/pt-internal.h index f01cb7ce..b787acf8 100644 --- a/htl/pt-internal.h +++ b/htl/pt-internal.h @@ -165,6 +165,7 @@ __pthread_dequeue (struct __pthread *thread) /* The total number of threads currently active. */ extern unsigned int __pthread_total; +libc_hidden_proto (__pthread_total) /* Concurrency hint. */ extern int __pthread_concurrency; diff --git a/htl/pt-nthreads.c b/htl/pt-nthreads.c new file mode 100644 index 00000000..9a6140ee --- /dev/null +++ b/htl/pt-nthreads.c @@ -0,0 +1,23 @@ +/* Thread counter variable. + Copyright (C) 2021-2023 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 + +/* Number of threads running. */ +unsigned int __pthread_total; +libc_hidden_data_def (__pthread_total) -- 2.38.1