mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-24 18:23:41 +08:00
72b3c6eecd
Instead of rely on runtime check to assure correct pthread types size a better strategy would use _Static_assert to trigger an error on build time (and thus allowing to check to potentially ABI breakage on cross-compiling make check). This patch moves nptl/tst-typesizes.c to libpthread build time on each specific initialization routine and also remove some runtime redundant asserts for the same type sizes. Checked on x86_64-linux-gnu and with a build check for all affected ABIs (aarch64-linux-gnu, alpha-linux-gnu, arm-linux-gnueabihf, hppa-linux-gnu, i686-linux-gnu, ia64-linux-gnu, m68k-linux-gnu, microblaze-linux-gnu, mips64-linux-gnu, mips64-n32-linux-gnu, mips-linux-gnu, powerpc64le-linux-gnu, powerpc-linux-gnu, s390-linux-gnu, s390x-linux-gnu, sh4-linux-gnu, sparc64-linux-gnu, sparcv9-linux-gnu, tilegx-linux-gnu, tilegx-linux-gnu-x32, tilepro-linux-gnu, x86_64-linux-gnu, and x86_64-linux-x32). * nptl/pthreadP.h (ASSERT_TYPE_SIZE, ASSERT_PTHREAD_INTERNAL_SIZE): New macros. * nptl/pthread_attr_init.c (__pthread_mutex_init): Add build time checks for expected input type size. * nptl/pthread_barrier_init.c (__pthread_barrier_init): Likewise. * nptl/pthread_barrierattr_init.c (pthread_barrierattr_init): Likewise. * nptl/pthread_cond_init.c (__pthread_cond_init): Likewise. * nptl/pthread_condattr_init.c (__pthread_condattr_init): Likewise. * nptl/pthread_mutex_init.c (__pthread_mutex_init): Likewise. * nptl/pthread_mutexattr_init.c (__pthread_mutexattr_init): Likewise. * nptl/pthread_rwlock_init.c (__pthread_rwlock_init): Likewise. * nptl/pthread_rwlockattr_init.c (pthread_rwlockattr_init): Likewise. * nptl/sem_init.c (__new_sem_init, __old_sem_init): Likewise * nptl/pthread_attr_destroy.c (__pthread_attr_destroy): Remove superflous runtime assert check. * nptl/pthread_attr_getaffinity.c (__pthread_attr_getaffinity_new): Likewise. * nptl/pthread_attr_getdetachstate.c (__pthread_attr_getdetachstate): Likewise. * nptl/pthread_attr_getguardsize.c (pthread_attr_getguardsize): Likewise. * nptl/pthread_attr_getinheritsched.c (__pthread_attr_getinheritsched): Likewise. * nptl/pthread_attr_getschedparam.c (__pthread_attr_getschedparam): Likewise. * nptl/pthread_attr_getschedpolicy.c (__pthread_attr_getschedpolicy): Likewise. * nptl/pthread_attr_getscope.c (__pthread_attr_getscope): Likewise. * nptl/pthread_attr_getstack.c (__pthread_attr_getstack): Likewise. * nptl/pthread_attr_getstackaddr.c (__pthread_attr_getstackaddr): Likewise. * nptl/pthread_attr_getstacksize.c (__pthread_attr_getstacksize): Likewise. * nptl/pthread_attr_setaffinity.c (__pthread_attr_setaffinity_new): Likewise. * nptl/pthread_attr_setdetachstate.c (__pthread_attr_setdetachstate): Likewise. * nptl/pthread_attr_setguardsize.c (pthread_attr_setguardsize): Likewise. * nptl/pthread_attr_setinheritsched.c (__pthread_attr_setinheritsched): Likewise. * nptl/pthread_attr_setschedparam.c (__pthread_attr_setschedparam): Likewise. * nptl/pthread_attr_setschedpolicy.c (__pthread_attr_setschedpolicy): Likewise. * nptl/pthread_attr_setscope.c (__pthread_attr_setscope): Likewise. * nptl/pthread_attr_setstack.c (__pthread_attr_setstack, __old_pthread_attr_setstack): Likewise. * nptl/pthread_attr_setstackaddr.c (__pthread_attr_setstackaddr): Likewise. * nptl/pthread_attr_setstacksize.c (__pthread_attr_setstacksize): Likewise. * nptl/pthread_getattr_default_np.c (pthread_getattr_default_np): Likewise. * nptl/pthread_mutex_lock.c (__pthread_mutex_lock): Likewise. * nptl/pthread_setattr_default_np.c (pthread_setattr_default_np): Likewise. * nptl/tst-typesizes.c: Remove file. Signed-off-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
95 lines
2.6 KiB
C
95 lines
2.6 KiB
C
/* Copyright (C) 2002-2017 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
|
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 <errno.h>
|
|
#include <semaphore.h>
|
|
#include <shlib-compat.h>
|
|
#include "semaphoreP.h"
|
|
#include <kernel-features.h>
|
|
#include <futex-internal.h>
|
|
|
|
|
|
int
|
|
__new_sem_init (sem_t *sem, int pshared, unsigned int value)
|
|
{
|
|
ASSERT_PTHREAD_INTERNAL_SIZE (sem_t, struct new_sem);
|
|
|
|
/* Parameter sanity check. */
|
|
if (__glibc_unlikely (value > SEM_VALUE_MAX))
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
pshared = pshared != 0 ? PTHREAD_PROCESS_SHARED : PTHREAD_PROCESS_PRIVATE;
|
|
int err = futex_supports_pshared (pshared);
|
|
if (err != 0)
|
|
{
|
|
__set_errno (err);
|
|
return -1;
|
|
}
|
|
|
|
/* Map to the internal type. */
|
|
struct new_sem *isem = (struct new_sem *) sem;
|
|
|
|
/* Use the values the caller provided. */
|
|
#if __HAVE_64B_ATOMICS
|
|
isem->data = value;
|
|
#else
|
|
isem->value = value << SEM_VALUE_SHIFT;
|
|
/* pad is used as a mutex on pre-v9 sparc and ignored otherwise. */
|
|
isem->pad = 0;
|
|
isem->nwaiters = 0;
|
|
#endif
|
|
|
|
isem->private = (pshared == PTHREAD_PROCESS_PRIVATE
|
|
? FUTEX_PRIVATE : FUTEX_SHARED);
|
|
|
|
return 0;
|
|
}
|
|
versioned_symbol (libpthread, __new_sem_init, sem_init, GLIBC_2_1);
|
|
|
|
|
|
|
|
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
|
|
int
|
|
attribute_compat_text_section
|
|
__old_sem_init (sem_t *sem, int pshared, unsigned int value)
|
|
{
|
|
ASSERT_PTHREAD_INTERNAL_SIZE (sem_t, struct new_sem);
|
|
|
|
/* Parameter sanity check. */
|
|
if (__glibc_unlikely (value > SEM_VALUE_MAX))
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
/* Map to the internal type. */
|
|
struct old_sem *isem = (struct old_sem *) sem;
|
|
|
|
/* Use the value the user provided. */
|
|
isem->value = value;
|
|
|
|
/* We cannot store the PSHARED attribute. So we always use the
|
|
operations needed for shared semaphores. */
|
|
|
|
return 0;
|
|
}
|
|
compat_symbol (libpthread, __old_sem_init, sem_init, GLIBC_2_0);
|
|
#endif
|