mirror of
https://sourceware.org/git/glibc.git
synced 2025-11-02 09:33:31 +03:00
c2d8f0b704
One group of warnings seen with -Wextra is warnings for static or inline not at the start of a declaration (-Wold-style-declaration). This patch fixes various such cases for inline, ensuring it comes at the start of the declaration (after any static). A common case of the fix is "static inline <type> __always_inline"; the definition of __always_inline starts with __inline, so the natural change is to "static __always_inline <type>". Other cases of the warning may be harder to fix (one pattern is a function definition that gets rewritten to be static by an including file, "#define funcname static wrapped_funcname" or similar), but it seems worth fixing these cases with inline anyway. Tested for x86_64. * elf/dl-load.h (_dl_postprocess_loadcmd): Use __always_inline before return type, without separate inline. * elf/dl-tunables.c (maybe_enable_malloc_check): Likewise. * elf/dl-tunables.h (tunable_is_name): Likewise. * malloc/malloc.c (do_set_trim_threshold): Likewise. (do_set_top_pad): Likewise. (do_set_mmap_threshold): Likewise. (do_set_mmaps_max): Likewise. (do_set_mallopt_check): Likewise. (do_set_perturb_byte): Likewise. (do_set_arena_test): Likewise. (do_set_arena_max): Likewise. (do_set_tcache_max): Likewise. (do_set_tcache_count): Likewise. (do_set_tcache_unsorted_limit): Likewise. * nis/nis_subr.c (count_dots): Likewise. * nptl/allocatestack.c (advise_stack_range): Likewise. * sysdeps/ieee754/dbl-64/s_sin.c (do_cos): Likewise. (do_sin): Likewise. (reduce_sincos): Likewise. (do_sincos): Likewise. * sysdeps/unix/sysv/linux/x86/elision-conf.c (do_set_elision_enable): Likewise. (TUNABLE_CALLBACK_FNDECL): Likewise.
137 lines
4.7 KiB
C
137 lines
4.7 KiB
C
/* elision-conf.c: Lock elision tunable parameters.
|
|
Copyright (C) 2013-2019 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include "config.h"
|
|
#include <pthreadP.h>
|
|
#include <init-arch.h>
|
|
#include <elision-conf.h>
|
|
#include <unistd.h>
|
|
|
|
#if HAVE_TUNABLES
|
|
# define TUNABLE_NAMESPACE elision
|
|
#endif
|
|
#include <elf/dl-tunables.h>
|
|
|
|
/* Reasonable initial tuning values, may be revised in the future.
|
|
This is a conservative initial value. */
|
|
|
|
struct elision_config __elision_aconf =
|
|
{
|
|
/* How often to not attempt to use elision if a transaction aborted
|
|
because the lock is already acquired. Expressed in number of lock
|
|
acquisition attempts. */
|
|
.skip_lock_busy = 3,
|
|
/* How often to not attempt to use elision if a transaction aborted due
|
|
to reasons other than other threads' memory accesses. Expressed in
|
|
number of lock acquisition attempts. */
|
|
.skip_lock_internal_abort = 3,
|
|
/* How often we retry using elision if there is chance for the transaction
|
|
to finish execution (e.g., it wasn't aborted due to the lock being
|
|
already acquired. */
|
|
.retry_try_xbegin = 3,
|
|
/* Same as SKIP_LOCK_INTERNAL_ABORT but for trylock. */
|
|
.skip_trylock_internal_abort = 3,
|
|
};
|
|
|
|
/* Force elision for all new locks. This is used to decide whether existing
|
|
DEFAULT locks should be automatically upgraded to elision in
|
|
pthread_mutex_lock(). Disabled for suid programs. Only used when elision
|
|
is available. */
|
|
|
|
int __pthread_force_elision attribute_hidden = 0;
|
|
|
|
#if HAVE_TUNABLES
|
|
static __always_inline void
|
|
do_set_elision_enable (int32_t elision_enable)
|
|
{
|
|
/* Enable elision if it's avaliable in hardware. It's not necessary to check
|
|
if __libc_enable_secure isn't enabled since elision_enable will be set
|
|
according to the default, which is disabled. */
|
|
if (elision_enable == 1)
|
|
__pthread_force_elision = HAS_CPU_FEATURE (RTM) ? 1 : 0;
|
|
}
|
|
|
|
/* The pthread->elision_enable tunable is 0 or 1 indicating that elision
|
|
should be disabled or enabled respectively. The feature will only be used
|
|
if it's supported by the hardware. */
|
|
|
|
void
|
|
TUNABLE_CALLBACK (set_elision_enable) (tunable_val_t *valp)
|
|
{
|
|
int32_t elision_enable = (int32_t) valp->numval;
|
|
do_set_elision_enable (elision_enable);
|
|
}
|
|
|
|
#define TUNABLE_CALLBACK_FNDECL(__name, __type) \
|
|
static __always_inline void \
|
|
do_set_elision_ ## __name (__type value) \
|
|
{ \
|
|
__elision_aconf.__name = value; \
|
|
} \
|
|
void \
|
|
TUNABLE_CALLBACK (set_elision_ ## __name) (tunable_val_t *valp) \
|
|
{ \
|
|
__type value = (__type) (valp)->numval; \
|
|
do_set_elision_ ## __name (value); \
|
|
}
|
|
|
|
TUNABLE_CALLBACK_FNDECL (skip_lock_busy, int32_t);
|
|
TUNABLE_CALLBACK_FNDECL (skip_lock_internal_abort, int32_t);
|
|
TUNABLE_CALLBACK_FNDECL (retry_try_xbegin, int32_t);
|
|
TUNABLE_CALLBACK_FNDECL (skip_trylock_internal_abort, int32_t);
|
|
#endif
|
|
|
|
/* Initialize elision. */
|
|
|
|
static void
|
|
elision_init (int argc __attribute__ ((unused)),
|
|
char **argv __attribute__ ((unused)),
|
|
char **environ)
|
|
{
|
|
#if HAVE_TUNABLES
|
|
/* Elision depends on tunables and must be explicitly turned on by setting
|
|
the appropriate tunable on a supported platform. */
|
|
|
|
TUNABLE_GET (enable, int32_t,
|
|
TUNABLE_CALLBACK (set_elision_enable));
|
|
TUNABLE_GET (skip_lock_busy, int32_t,
|
|
TUNABLE_CALLBACK (set_elision_skip_lock_busy));
|
|
TUNABLE_GET (skip_lock_internal_abort, int32_t,
|
|
TUNABLE_CALLBACK (set_elision_skip_lock_internal_abort));
|
|
TUNABLE_GET (tries, int32_t,
|
|
TUNABLE_CALLBACK (set_elision_retry_try_xbegin));
|
|
TUNABLE_GET (skip_trylock_internal_abort, int32_t,
|
|
TUNABLE_CALLBACK (set_elision_skip_trylock_internal_abort));
|
|
#endif
|
|
|
|
if (!__pthread_force_elision)
|
|
__elision_aconf.retry_try_xbegin = 0; /* Disable elision on rwlocks. */
|
|
}
|
|
|
|
#ifdef SHARED
|
|
# define INIT_SECTION ".init_array"
|
|
#else
|
|
# define INIT_SECTION ".preinit_array"
|
|
#endif
|
|
|
|
void (*const __pthread_init_array []) (int, char **, char **)
|
|
__attribute__ ((section (INIT_SECTION), aligned (sizeof (void *)))) =
|
|
{
|
|
&elision_init
|
|
};
|