mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-18 14:30:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

nptl: Move internal symbol __mutex_aconf into libc

Browse Source 
This is in preparation of moving the mutex code into libc.

__pthread_tunables_init is now called via __pthread_early_init.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
This commit is contained in:
Florian Weimer 2021-04-21 19:49:51 +02:00
parent 1f3ed1e0c8
commit eda0c098ed
7 changed files with 72 additions and 6 deletions

2
nptl/Makefile

@ -83,6 +83,7 @@ routines = \
pthread_key_delete \
pthread_keys \
pthread_kill \
pthread_mutex_conf \
pthread_mutex_consistent \
pthread_once \
pthread_rwlock_rdlock \
@ -153,7 +154,6 @@ libpthread-routines = \
pthread_join_common \
pthread_kill_other_threads \
pthread_mutex_cond_lock \
pthread_mutex_conf \
pthread_mutex_destroy \
pthread_mutex_getprioceiling \
pthread_mutex_init \

1
nptl/Versions

@ -132,6 +132,7 @@ libc {
__lll_lock_wait_private;
__lll_trylock_elision;
__lll_unlock_elision;
__mutex_aconf;
__nptl_deallocate_tsd;
__nptl_nthreads;
__pthread_attr_copy;

4
nptl/nptl-init.c

@ -268,10 +268,6 @@ __pthread_initialize_minimal_internal (void)
__libc_multiple_threads_ptr =
#endif
__libc_pthread_init (__reclaim_stacks, ptr_pthread_functions);
#if HAVE_TUNABLES
__pthread_tunables_init ();
#endif
}
strong_alias (__pthread_initialize_minimal_internal,
__pthread_initialize_minimal)

1
nptl/pthread_mutex_conf.c

@ -30,6 +30,7 @@ struct mutex_config __mutex_aconf =
calling into kernel to block. */
.spin_count = DEFAULT_ADAPTIVE_COUNT,
};
libc_hidden_data_def (__mutex_aconf)
static void
TUNABLE_CALLBACK (set_mutex_spin_count) (tunable_val_t *valp)

33
sysdeps/nptl/pthread_early_init.h Normal file

@ -0,0 +1,33 @@
/* pthread initialization called from __libc_early_init. NPTL version.
Copyright (C) 2021 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
<https://www.gnu.org/licenses/>. */
#ifndef _PTHREAD_EARLY_INIT_H
#define _PTHREAD_EARLY_INIT_H 1
#include <nptl/pthreadP.h>
#include <pthread_mutex_conf.h>
static inline void
__pthread_early_init (void)
{
#if HAVE_TUNABLES
__pthread_tunables_init ();
#endif
}
#endif /* _PTHREAD_EARLY_INIT_H */

9
nptl/pthread_mutex_conf.h → sysdeps/nptl/pthread_mutex_conf.h

@ -26,9 +26,16 @@ struct mutex_config
int spin_count;
};
extern struct mutex_config __mutex_aconf attribute_hidden;
extern struct mutex_config __mutex_aconf;
libc_hidden_proto (__mutex_aconf)
extern void __pthread_tunables_init (void) attribute_hidden;
#else
static inline void
__pthread_tunables_init (void)
{
/* No tunables to initialize. */
}
#endif
#endif

28
sysdeps/pthread/pthread_mutex_conf.h Normal file

@ -0,0 +1,28 @@
/* Pthread mutex tunable parameters. Generic version.
Copyright (C) 2018-2021 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
<https://www.gnu.org/licenses/>. */
#ifndef _PTHREAD_MUTEX_CONF_H
#define _PTHREAD_MUTEX_CONF_H 1
static inline void
__pthread_tunables_init (void)
{
/* The generic version does not have any tunables to init. */
}
#endif