From eda0c098ed31489ce21f15d775ed96c1f6b395ad Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Wed, 21 Apr 2021 19:49:51 +0200 Subject: nptl: Move internal symbol __mutex_aconf into libc 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 --- sysdeps/nptl/pthread_early_init.h | 33 +++++++++++++++++++++++++++++ sysdeps/nptl/pthread_mutex_conf.h | 41 ++++++++++++++++++++++++++++++++++++ sysdeps/pthread/pthread_mutex_conf.h | 28 ++++++++++++++++++++++++ 3 files changed, 102 insertions(+) create mode 100644 sysdeps/nptl/pthread_early_init.h create mode 100644 sysdeps/nptl/pthread_mutex_conf.h create mode 100644 sysdeps/pthread/pthread_mutex_conf.h (limited to 'sysdeps') diff --git a/sysdeps/nptl/pthread_early_init.h b/sysdeps/nptl/pthread_early_init.h new file mode 100644 index 0000000000..2d15303dd9 --- /dev/null +++ b/sysdeps/nptl/pthread_early_init.h @@ -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 + . */ + +#ifndef _PTHREAD_EARLY_INIT_H +#define _PTHREAD_EARLY_INIT_H 1 + +#include +#include + +static inline void +__pthread_early_init (void) +{ +#if HAVE_TUNABLES + __pthread_tunables_init (); +#endif +} + +#endif /* _PTHREAD_EARLY_INIT_H */ diff --git a/sysdeps/nptl/pthread_mutex_conf.h b/sysdeps/nptl/pthread_mutex_conf.h new file mode 100644 index 0000000000..9dba4bfa6d --- /dev/null +++ b/sysdeps/nptl/pthread_mutex_conf.h @@ -0,0 +1,41 @@ +/* Pthread mutex tunable parameters. + 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 + . */ +#ifndef _PTHREAD_MUTEX_CONF_H +#define _PTHREAD_MUTEX_CONF_H 1 + +#include + +#if HAVE_TUNABLES +struct mutex_config +{ + int spin_count; +}; + +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 diff --git a/sysdeps/pthread/pthread_mutex_conf.h b/sysdeps/pthread/pthread_mutex_conf.h new file mode 100644 index 0000000000..c999c980f7 --- /dev/null +++ b/sysdeps/pthread/pthread_mutex_conf.h @@ -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 + . */ + +#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 -- cgit 1.4.1