From patchwork Sat Oct 15 07:44:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 16527 Received: (qmail 21108 invoked by alias); 15 Oct 2016 07:44:29 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 21090 invoked by uid 89); 15 Oct 2016 07:44:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=1.6 required=5.0 tests=BAYES_50, RCVD_IN_DNSWL_NONE, SPF_NEUTRAL autolearn=no version=3.3.2 spammy=smt, SMT, 1206, nptlinitc X-HELO: homiemail-a43.g.dreamhost.com From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Subject: [PATCH] Remove __is_smp Date: Sat, 15 Oct 2016 13:14:02 +0530 Message-Id: <1476517442-11759-1-git-send-email-siddhesh@sourceware.org> The flag is always set to 1, so there is no longer a point in setting and checking it. Tested on x86_64 to verify that the testsuite does not regress. Siddhesh --- nptl/nptl-init.c | 4 ---- nptl/pthreadP.h | 3 --- nptl/pthread_mutex_lock.c | 3 --- nptl/pthread_mutex_timedlock.c | 2 -- nptl/smp.h | 27 --------------------------- nptl/vars.c | 3 --- 6 files changed, 42 deletions(-) delete mode 100644 nptl/smp.h diff --git a/nptl/nptl-init.c b/nptl/nptl-init.c index bdbdfed..b5a744c 100644 --- a/nptl/nptl-init.c +++ b/nptl/nptl-init.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -493,9 +492,6 @@ __pthread_initialize_minimal_internal (void) #endif __libc_pthread_init (&__fork_generation, __reclaim_stacks, ptr_pthread_functions); - - /* Determine whether the machine is SMP or not. */ - __is_smp = is_smp_system (); } strong_alias (__pthread_initialize_minimal_internal, __pthread_initialize_minimal) diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h index 6e0dd09..2364c07 100644 --- a/nptl/pthreadP.h +++ b/nptl/pthreadP.h @@ -178,9 +178,6 @@ extern int __default_pthread_attr_lock attribute_hidden; extern size_t __static_tls_size attribute_hidden; extern size_t __static_tls_align_m1 attribute_hidden; -/* Flag whether the machine is SMP or not. */ -extern int __is_smp attribute_hidden; - /* Thread descriptor handling. */ extern list_t __stack_user; hidden_proto (__stack_user) diff --git a/nptl/pthread_mutex_lock.c b/nptl/pthread_mutex_lock.c index bdfa529..d48dd0c 100644 --- a/nptl/pthread_mutex_lock.c +++ b/nptl/pthread_mutex_lock.c @@ -120,9 +120,6 @@ __pthread_mutex_lock (pthread_mutex_t *mutex) else if (__builtin_expect (PTHREAD_MUTEX_TYPE (mutex) == PTHREAD_MUTEX_ADAPTIVE_NP, 1)) { - if (! __is_smp) - goto simple; - if (LLL_MUTEX_TRYLOCK (mutex) != 0) { int cnt = 0; diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c index 07f0901..f965883 100644 --- a/nptl/pthread_mutex_timedlock.c +++ b/nptl/pthread_mutex_timedlock.c @@ -110,8 +110,6 @@ pthread_mutex_timedlock (pthread_mutex_t *mutex, case PTHREAD_MUTEX_ADAPTIVE_NP: - if (! __is_smp) - goto simple; if (lll_trylock (mutex->__data.__lock) != 0) { diff --git a/nptl/smp.h b/nptl/smp.h deleted file mode 100644 index bedfb46..0000000 --- a/nptl/smp.h +++ /dev/null @@ -1,27 +0,0 @@ -/* Determine whether the host has multiple processors. Stub version. - Copyright (C) 1996-2016 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 Library General Public License as - published by the Free Software Foundation; either version 2 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 - Library General Public License for more details. - - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If - not, see . */ - -/* Test whether the machine has more than one processor. This is not the - best test but good enough. More complicated tests would require `malloc' - which is not available at that time. */ -static inline int -is_smp_system (void) -{ - /* Assume all machines are SMP and/or CMT and/or SMT. */ - return 1; -} diff --git a/nptl/vars.c b/nptl/vars.c index f09c712..80a605c 100644 --- a/nptl/vars.c +++ b/nptl/vars.c @@ -27,9 +27,6 @@ struct pthread_attr __default_pthread_attr attribute_hidden; /* Mutex protecting __default_pthread_attr. */ int __default_pthread_attr_lock = LLL_LOCK_INITIALIZER; -/* Flag whether the machine is SMP or not. */ -int __is_smp attribute_hidden; - #ifndef TLS_MULTIPLE_THREADS_IN_TCB /* Variable set to a nonzero value either if more than one thread runs or ran, or if a single-threaded process is trying to cancel itself. See