2017-11-07 Adhemerval Zanella <adhemerval.zanella@linaro.org>
+ * 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.
+
* nptl/pthreadP.h (ASSERT_PTHREAD_STRING,
ASSERT_PTHREAD_INTERNAL_OFFSET): New macro.
* nptl/pthread_mutex_init.c (__pthread_mutex_init): Add build time
return EINVAL;
}
+#define ASSERT_TYPE_SIZE(type, size) \
+ _Static_assert (sizeof (type) == size, \
+ "sizeof (" #type ") != " #size)
+
+#define ASSERT_PTHREAD_INTERNAL_SIZE(type, internal) \
+ _Static_assert (sizeof ((type) { 0 }).__size >= sizeof (internal), \
+ "sizeof (" #type ".__size) < sizeof (" #internal ")")
+
#define ASSERT_PTHREAD_STRING(x) __STRING (x)
#define ASSERT_PTHREAD_INTERNAL_OFFSET(type, member, offset) \
_Static_assert (offsetof (type, member) == offset, \
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
#if SHLIB_COMPAT(libpthread, GLIBC_2_0, GLIBC_2_1)
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include <pthreadP.h>
#include <string.h>
{
const struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (const struct pthread_attr *) attr;
if (iattr->cpuset != NULL)
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
*detachstate = (iattr->flags & ATTR_FLAG_DETACHSTATE
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
*guardsize = iattr->guardsize;
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Store the current values. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <string.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Copy the current values. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Store the current values. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Store the current values. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Store the result. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Some code assumes this function to work even if no stack address
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
size_t size = iattr->stacksize;
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include <string.h>
#include <unistd.h>
{
struct pthread_attr *iattr;
+ ASSERT_TYPE_SIZE (pthread_attr_t, __SIZEOF_PTHREAD_ATTR_T);
+ ASSERT_PTHREAD_INTERNAL_SIZE (pthread_attr_t, struct pthread_attr);
+
/* Many elements are initialized to zero so let us do it all at
once. This also takes care of clearing the bytes which are not
internally used. */
memset (attr, '\0', __SIZEOF_PTHREAD_ATTR_T);
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Default guard size specified by the standard. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include <limits.h>
#include <stdlib.h>
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
if (cpuset == NULL || cpusetsize == 0)
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Catch invalid values. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Note that we don't round the value here. The standard requires
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Catch invalid values. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include <string.h>
#include "pthreadP.h"
__pthread_attr_setschedparam (pthread_attr_t *attr,
const struct sched_param *param)
{
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
struct pthread_attr *iattr = (struct pthread_attr *) attr;
int ret = check_sched_priority_attr (param->sched_priority,
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Catch invalid values. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Catch invalid values. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include <limits.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Catch invalid sizes. */
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Catch invalid sizes. */
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include "pthreadP.h"
EXTRA_PARAM_CHECKS;
#endif
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
iattr->stackaddr = stackaddr;
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
-#include <assert.h>
#include <errno.h>
#include <limits.h>
#include "pthreadP.h"
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Catch invalid sizes. */
{
struct pthread_attr *iattr;
- assert (sizeof (*attr) >= sizeof (struct pthread_attr));
iattr = (struct pthread_attr *) attr;
/* Catch invalid sizes. */
__pthread_barrier_init (pthread_barrier_t *barrier,
const pthread_barrierattr_t *attr, unsigned int count)
{
+ ASSERT_TYPE_SIZE (pthread_barrier_t, __SIZEOF_PTHREAD_BARRIER_T);
+ ASSERT_PTHREAD_INTERNAL_SIZE (pthread_barrier_t,
+ struct pthread_barrier);
+
struct pthread_barrier *ibarrier;
/* XXX EINVAL is not specified by POSIX as a possible error code for COUNT
int
pthread_barrierattr_init (pthread_barrierattr_t *attr)
{
+ ASSERT_TYPE_SIZE (pthread_barrierattr_t, __SIZEOF_PTHREAD_BARRIERATTR_T);
+ ASSERT_PTHREAD_INTERNAL_SIZE (pthread_barrierattr_t,
+ struct pthread_barrierattr);
+
((struct pthread_barrierattr *) attr)->pshared = PTHREAD_PROCESS_PRIVATE;
return 0;
int
__pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *cond_attr)
{
+ ASSERT_TYPE_SIZE (pthread_cond_t, __SIZEOF_PTHREAD_COND_T);
+
struct pthread_condattr *icond_attr = (struct pthread_condattr *) cond_attr;
memset (cond, 0, sizeof (pthread_cond_t));
int
__pthread_condattr_init (pthread_condattr_t *attr)
{
+ ASSERT_TYPE_SIZE (pthread_condattr_t, __SIZEOF_PTHREAD_CONDATTR_T);
+ ASSERT_PTHREAD_INTERNAL_SIZE (pthread_condattr_t,
+ struct pthread_condattr);
+
struct pthread_condattr *iattr = (struct pthread_condattr *) attr;
/* Default is not pshared and CLOCK_REALTIME. */
iattr-> value = CLOCK_REALTIME << 1;
#include <errno.h>
#include <stdlib.h>
#include <pthreadP.h>
-#include <assert.h>
int
pthread_getattr_default_np (pthread_attr_t *out)
{
struct pthread_attr *real_out;
- assert (sizeof (*out) >= sizeof (struct pthread_attr));
real_out = (struct pthread_attr *) out;
lll_lock (__default_pthread_attr_lock, LLL_PRIVATE);
{
const struct pthread_mutexattr *imutexattr;
- assert (sizeof (pthread_mutex_t) <= __SIZEOF_PTHREAD_MUTEX_T);
+ ASSERT_TYPE_SIZE (pthread_mutex_t, __SIZEOF_PTHREAD_MUTEX_T);
+
ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__nusers,
__PTHREAD_MUTEX_NUSERS_OFFSET);
ASSERT_PTHREAD_INTERNAL_OFFSET (pthread_mutex_t, __data.__kind,
int
__pthread_mutex_lock (pthread_mutex_t *mutex)
{
- assert (sizeof (mutex->__size) >= sizeof (mutex->__data));
-
unsigned int type = PTHREAD_MUTEX_TYPE_ELISION (mutex);
LIBC_PROBE (mutex_entry, 1, mutex);
int
__pthread_mutexattr_init (pthread_mutexattr_t *attr)
{
+ ASSERT_TYPE_SIZE (pthread_mutexattr_t, __SIZEOF_PTHREAD_MUTEXATTR_T);
+ ASSERT_PTHREAD_INTERNAL_SIZE (pthread_mutexattr_t,
+ struct pthread_mutexattr);
+
if (sizeof (struct pthread_mutexattr) != sizeof (pthread_mutexattr_t))
memset (attr, '\0', sizeof (*attr));
__pthread_rwlock_init (pthread_rwlock_t *rwlock,
const pthread_rwlockattr_t *attr)
{
+ ASSERT_TYPE_SIZE (pthread_rwlock_t, __SIZEOF_PTHREAD_RWLOCK_T);
+
const struct pthread_rwlockattr *iattr;
iattr = ((const struct pthread_rwlockattr *) attr) ?: &default_rwlockattr;
int
pthread_rwlockattr_init (pthread_rwlockattr_t *attr)
{
+ ASSERT_TYPE_SIZE (pthread_rwlockattr_t, __SIZEOF_PTHREAD_RWLOCKATTR_T);
+ ASSERT_PTHREAD_INTERNAL_SIZE (pthread_rwlockattr_t,
+ struct pthread_rwlockattr);
+
struct pthread_rwlockattr *iattr;
iattr = (struct pthread_rwlockattr *) attr;
#include <errno.h>
#include <stdlib.h>
#include <pthreadP.h>
-#include <assert.h>
#include <string.h>
struct pthread_attr attrs;
int ret;
- assert (sizeof (*in) >= sizeof (struct pthread_attr));
real_in = (struct pthread_attr *) in;
/* Catch invalid values. */
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))
{
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))
{
+++ /dev/null
-/* Copyright (C) 2005-2017 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
- Contributed by Ulrich Drepper <drepper@redhat.com>, 2005.
-
- 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 <stdio.h>
-#include <pthreadP.h>
-#include <semaphore.h>
-
-static const struct
-{
- const char *name;
- size_t expected;
- size_t is;
-} types[] =
- {
-#define T(t, c) \
- { #t, c, sizeof (t) }
- T (pthread_attr_t, __SIZEOF_PTHREAD_ATTR_T),
- T (pthread_mutex_t, __SIZEOF_PTHREAD_MUTEX_T),
- T (pthread_mutexattr_t, __SIZEOF_PTHREAD_MUTEXATTR_T),
- T (pthread_cond_t, __SIZEOF_PTHREAD_COND_T),
- T (pthread_condattr_t, __SIZEOF_PTHREAD_CONDATTR_T),
- T (pthread_rwlock_t, __SIZEOF_PTHREAD_RWLOCK_T),
- T (pthread_rwlockattr_t, __SIZEOF_PTHREAD_RWLOCKATTR_T),
- T (pthread_barrier_t, __SIZEOF_PTHREAD_BARRIER_T),
- T (pthread_barrierattr_t, __SIZEOF_PTHREAD_BARRIERATTR_T)
- };
-
-static int
-do_test (void)
-{
- int result = 0;
-
-#define TEST_TYPE(name) \
- printf ("%s: ", #name); \
- if (sizeof (name) != sizeof (((name *) 0)->__size)) \
- { \
- printf ("expected %zu, is %zu\n", \
- sizeof (((name *) 0)->__size), sizeof (name)); \
- result = 1; \
- } \
- else \
- puts ("OK")
-
- TEST_TYPE (pthread_mutex_t);
- TEST_TYPE (pthread_cond_t);
- TEST_TYPE (pthread_rwlock_t);
-
-#define TEST_TYPE2(name, internal) \
- printf ("%s: ", #name); \
- if (sizeof (((name *) 0)->__size) < sizeof (internal)) \
- { \
- printf ("expected %zu, is %zu\n", \
- sizeof (((name *) 0)->__size), sizeof (internal)); \
- result = 1; \
- } \
- else \
- puts ("OK")
-
- TEST_TYPE2 (pthread_attr_t, struct pthread_attr);
- TEST_TYPE2 (pthread_mutexattr_t, struct pthread_mutexattr);
- TEST_TYPE2 (pthread_condattr_t, struct pthread_condattr);
- TEST_TYPE2 (pthread_rwlockattr_t, struct pthread_rwlockattr);
- TEST_TYPE2 (pthread_barrier_t, struct pthread_barrier);
- TEST_TYPE2 (pthread_barrierattr_t, struct pthread_barrierattr);
- TEST_TYPE2 (sem_t, struct new_sem);
- TEST_TYPE2 (sem_t, struct old_sem);
-
- for (size_t i = 0; i < sizeof (types) / sizeof (types[0]); ++i)
- if (types[i].expected != types[i].is)
- {
- printf ("%s: expected %zu, is %zu\n",
- types[i].name, types[i].expected, types[i].is);
- result = 1;
- }
-
- return result;
-}
-
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
projects / thirdparty / glibc.git / commitdiff
