summaryrefslogtreecommitdiff
path: root/libpthread/sysdeps
diff options
context:
space:
mode:
Diffstat (limited to 'libpthread/sysdeps')
-rw-r--r--libpthread/sysdeps/generic/bits/cancelation.h6
-rw-r--r--libpthread/sysdeps/generic/bits/mutex-attr.h1
-rw-r--r--libpthread/sysdeps/generic/bits/mutex.h10
-rw-r--r--libpthread/sysdeps/generic/pt-mutex-destroy.c3
-rw-r--r--libpthread/sysdeps/generic/pt-mutex-init.c13
-rw-r--r--libpthread/sysdeps/generic/pt-mutex-timedlock.c22
-rw-r--r--libpthread/sysdeps/generic/pt-mutex-transfer-np.c11
-rw-r--r--libpthread/sysdeps/generic/pt-mutex-trylock.c16
-rw-r--r--libpthread/sysdeps/generic/pt-mutex-unlock.c16
-rw-r--r--libpthread/sysdeps/generic/pt-mutexattr.c8
-rw-r--r--libpthread/sysdeps/hurd/pt-kill.c3
11 files changed, 77 insertions, 32 deletions
diff --git a/libpthread/sysdeps/generic/bits/cancelation.h b/libpthread/sysdeps/generic/bits/cancelation.h
index f446d595..db9169a9 100644
--- a/libpthread/sysdeps/generic/bits/cancelation.h
+++ b/libpthread/sysdeps/generic/bits/cancelation.h
@@ -38,9 +38,9 @@ struct __pthread_cancelation_handler **__pthread_get_cleanup_stack (void);
= __pthread_get_cleanup_stack (); \
struct __pthread_cancelation_handler __handler = \
{ \
- handler: (rt), \
- arg: (rtarg), \
- next: *__handlers \
+ (rt), \
+ (rtarg), \
+ *__handlers \
}; \
*__handlers = &__handler;
diff --git a/libpthread/sysdeps/generic/bits/mutex-attr.h b/libpthread/sysdeps/generic/bits/mutex-attr.h
index 9161cdab..8514ebe8 100644
--- a/libpthread/sysdeps/generic/bits/mutex-attr.h
+++ b/libpthread/sysdeps/generic/bits/mutex-attr.h
@@ -35,6 +35,7 @@ struct __pthread_mutexattr
};
/* Attributes for a recursive mutex. */
+extern const struct __pthread_mutexattr __pthread_errorcheck_mutexattr;
extern const struct __pthread_mutexattr __pthread_recursive_mutexattr;
#endif /* bits/mutex-attr.h */
diff --git a/libpthread/sysdeps/generic/bits/mutex.h b/libpthread/sysdeps/generic/bits/mutex.h
index 86068cf5..c734c393 100644
--- a/libpthread/sysdeps/generic/bits/mutex.h
+++ b/libpthread/sysdeps/generic/bits/mutex.h
@@ -57,9 +57,17 @@ struct __pthread_mutex
# define __PTHREAD_MUTEX_INITIALIZER \
{ __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, 0, 0, 0, 0 }
+# define __PTHREAD_ERRORCHECK_MUTEXATTR ((struct __pthread_mutexattr *) ((unsigned long) __PTHREAD_MUTEX_ERRORCHECK + 1))
+
+# define __PTHREAD_ERRORCHECK_MUTEX_INITIALIZER \
+ { __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, \
+ __PTHREAD_ERRORCHECK_MUTEXATTR, 0, 0, 0 }
+
+# define __PTHREAD_RECURSIVE_MUTEXATTR ((struct __pthread_mutexattr *) ((unsigned long) __PTHREAD_MUTEX_RECURSIVE + 1))
+
# define __PTHREAD_RECURSIVE_MUTEX_INITIALIZER \
{ __PTHREAD_SPIN_LOCK_INITIALIZER, __PTHREAD_SPIN_LOCK_INITIALIZER, 0, 0, \
- (struct __pthread_mutexattr *) &__pthread_recursive_mutexattr, 0, 0, 0 }
+ __PTHREAD_RECURSIVE_MUTEXATTR, 0, 0, 0 }
# endif
#endif /* Not __pthread_mutex_defined. */
diff --git a/libpthread/sysdeps/generic/pt-mutex-destroy.c b/libpthread/sysdeps/generic/pt-mutex-destroy.c
index b0ca00f7..3bbc73fe 100644
--- a/libpthread/sysdeps/generic/pt-mutex-destroy.c
+++ b/libpthread/sysdeps/generic/pt-mutex-destroy.c
@@ -26,7 +26,8 @@
int
_pthread_mutex_destroy (pthread_mutex_t *mutex)
{
- if (mutex->attr == &__pthread_recursive_mutexattr)
+ if (mutex->attr == __PTHREAD_ERRORCHECK_MUTEXATTR
+ || mutex->attr == __PTHREAD_RECURSIVE_MUTEXATTR)
/* Static attributes. */
;
else
diff --git a/libpthread/sysdeps/generic/pt-mutex-init.c b/libpthread/sysdeps/generic/pt-mutex-init.c
index a818fe3a..2f960286 100644
--- a/libpthread/sysdeps/generic/pt-mutex-init.c
+++ b/libpthread/sysdeps/generic/pt-mutex-init.c
@@ -35,14 +35,11 @@ _pthread_mutex_init (pthread_mutex_t *mutex,
/* The default attributes. */
return 0;
- if (attr == &__pthread_recursive_mutexattr)
- /* Non-default but known attributes. */
- {
- mutex->attr = attr;
- return 0;
- }
-
- mutex->attr = malloc (sizeof *attr);
+ if (! mutex->attr
+ || mutex->attr == __PTHREAD_ERRORCHECK_MUTEXATTR
+ || mutex->attr == __PTHREAD_RECURSIVE_MUTEXATTR)
+ mutex->attr = malloc (sizeof *attr);
+
if (! mutex->attr)
return ENOMEM;
diff --git a/libpthread/sysdeps/generic/pt-mutex-timedlock.c b/libpthread/sysdeps/generic/pt-mutex-timedlock.c
index ee432192..883e50af 100644
--- a/libpthread/sysdeps/generic/pt-mutex-timedlock.c
+++ b/libpthread/sysdeps/generic/pt-mutex-timedlock.c
@@ -31,6 +31,12 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
const struct timespec *abstime)
{
struct __pthread *self;
+ const struct __pthread_mutexattr *attr = mutex->attr;
+
+ if (attr == __PTHREAD_ERRORCHECK_MUTEXATTR)
+ attr = &__pthread_errorcheck_mutexattr;
+ if (attr == __PTHREAD_RECURSIVE_MUTEXATTR)
+ attr = &__pthread_recursive_mutexattr;
__pthread_spin_lock (&mutex->__lock);
if (__pthread_spin_trylock (&mutex->__held) == 0)
@@ -50,8 +56,8 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
#endif
#endif
- if (mutex->attr)
- switch (mutex->attr->mutex_type)
+ if (attr)
+ switch (attr->mutex_type)
{
case PTHREAD_MUTEX_NORMAL:
break;
@@ -75,7 +81,7 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
self = _pthread_self ();
assert (self);
- if (! mutex->attr || mutex->attr->mutex_type == PTHREAD_MUTEX_NORMAL)
+ if (! attr || attr->mutex_type == PTHREAD_MUTEX_NORMAL)
{
#if defined(ALWAYS_TRACK_MUTEX_OWNER)
assert (mutex->owner != self);
@@ -83,7 +89,7 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
}
else
{
- switch (mutex->attr->mutex_type)
+ switch (attr->mutex_type)
{
case PTHREAD_MUTEX_ERRORCHECK:
if (mutex->owner == self)
@@ -108,7 +114,7 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
}
#if !defined(ALWAYS_TRACK_MUTEX_OWNER)
- if (mutex->attr && mutex->attr->mutex_type != PTHREAD_MUTEX_NORMAL)
+ if (attr && attr->mutex_type != PTHREAD_MUTEX_NORMAL)
#endif
assert (mutex->owner);
@@ -147,14 +153,14 @@ __pthread_mutex_timedlock_internal (struct __pthread_mutex *mutex,
__pthread_block (self);
#if !defined(ALWAYS_TRACK_MUTEX_OWNER)
- if (mutex->attr && mutex->attr->mutex_type != PTHREAD_MUTEX_NORMAL)
+ if (attr && attr->mutex_type != PTHREAD_MUTEX_NORMAL)
#endif
{
assert (mutex->owner == self);
}
- if (mutex->attr)
- switch (mutex->attr->mutex_type)
+ if (attr)
+ switch (attr->mutex_type)
{
case PTHREAD_MUTEX_NORMAL:
break;
diff --git a/libpthread/sysdeps/generic/pt-mutex-transfer-np.c b/libpthread/sysdeps/generic/pt-mutex-transfer-np.c
index 7796ac4f..967f1c7c 100644
--- a/libpthread/sysdeps/generic/pt-mutex-transfer-np.c
+++ b/libpthread/sysdeps/generic/pt-mutex-transfer-np.c
@@ -29,13 +29,20 @@ __pthread_mutex_transfer_np (struct __pthread_mutex *mutex, pthread_t tid)
assert (mutex->owner == _pthread_self ());
struct __pthread *thread = __pthread_getid (tid);
+ const struct __pthread_mutexattr *attr = mutex->attr;
+
if (! thread)
return ESRCH;
if (thread == _pthread_self ())
return 0;
- if (mutex->attr && mutex->attr->mutex_type == PTHREAD_MUTEX_ERRORCHECK)
+ if (attr == __PTHREAD_ERRORCHECK_MUTEXATTR)
+ attr = &__pthread_errorcheck_mutexattr;
+ if (attr == __PTHREAD_RECURSIVE_MUTEXATTR)
+ attr = &__pthread_recursive_mutexattr;
+
+ if (attr && attr->mutex_type == PTHREAD_MUTEX_ERRORCHECK)
{
if (mutex->owner != _pthread_self ())
@@ -46,7 +53,7 @@ __pthread_mutex_transfer_np (struct __pthread_mutex *mutex, pthread_t tid)
#ifndef NDEBUG
# if !defined(ALWAYS_TRACK_MUTEX_OWNER)
- if (mutex->attr && mutex->attr->mutex_type != PTHREAD_MUTEX_NORMAL)
+ if (attr && attr->mutex_type != PTHREAD_MUTEX_NORMAL)
# endif
{
mutex->owner = thread;
diff --git a/libpthread/sysdeps/generic/pt-mutex-trylock.c b/libpthread/sysdeps/generic/pt-mutex-trylock.c
index 5264dc7b..7a54cc9a 100644
--- a/libpthread/sysdeps/generic/pt-mutex-trylock.c
+++ b/libpthread/sysdeps/generic/pt-mutex-trylock.c
@@ -29,11 +29,18 @@ __pthread_mutex_trylock (struct __pthread_mutex *mutex)
{
int err;
struct __pthread *self;
+ const struct __pthread_mutexattr *attr = mutex->attr;
+
+ if (attr == __PTHREAD_ERRORCHECK_MUTEXATTR)
+ attr = &__pthread_errorcheck_mutexattr;
+ if (attr == __PTHREAD_RECURSIVE_MUTEXATTR)
+ attr = &__pthread_recursive_mutexattr;
__pthread_spin_lock (&mutex->__lock);
if (__pthread_spin_trylock (&mutex->__held) == 0)
/* Acquired the lock. */
{
+#if defined(ALWAYS_TRACK_MUTEX_OWNER)
#ifndef NDEBUG
self = _pthread_self ();
if (self)
@@ -45,9 +52,10 @@ __pthread_mutex_trylock (struct __pthread_mutex *mutex)
mutex->owner = _pthread_self ();
}
#endif
+#endif
- if (mutex->attr)
- switch (mutex->attr->mutex_type)
+ if (attr)
+ switch (attr->mutex_type)
{
case PTHREAD_MUTEX_NORMAL:
break;
@@ -68,10 +76,10 @@ __pthread_mutex_trylock (struct __pthread_mutex *mutex)
err = EBUSY;
- if (mutex->attr)
+ if (attr)
{
self = _pthread_self ();
- switch (mutex->attr->mutex_type)
+ switch (attr->mutex_type)
{
case PTHREAD_MUTEX_NORMAL:
break;
diff --git a/libpthread/sysdeps/generic/pt-mutex-unlock.c b/libpthread/sysdeps/generic/pt-mutex-unlock.c
index 7645fd4c..09d70f8f 100644
--- a/libpthread/sysdeps/generic/pt-mutex-unlock.c
+++ b/libpthread/sysdeps/generic/pt-mutex-unlock.c
@@ -28,10 +28,16 @@ int
__pthread_mutex_unlock (pthread_mutex_t *mutex)
{
struct __pthread *wakeup;
-
+ const struct __pthread_mutexattr *attr = mutex->attr;
+
+ if (attr == __PTHREAD_ERRORCHECK_MUTEXATTR)
+ attr = &__pthread_errorcheck_mutexattr;
+ if (attr == __PTHREAD_RECURSIVE_MUTEXATTR)
+ attr = &__pthread_recursive_mutexattr;
+
__pthread_spin_lock (&mutex->__lock);
- if (! mutex->attr || mutex->attr->mutex_type == PTHREAD_MUTEX_NORMAL)
+ if (! attr || attr->mutex_type == PTHREAD_MUTEX_NORMAL)
{
#if defined(ALWAYS_TRACK_MUTEX_OWNER)
# ifndef NDEBUG
@@ -45,7 +51,7 @@ __pthread_mutex_unlock (pthread_mutex_t *mutex)
#endif
}
else
- switch (mutex->attr->mutex_type)
+ switch (attr->mutex_type)
{
case PTHREAD_MUTEX_ERRORCHECK:
case PTHREAD_MUTEX_RECURSIVE:
@@ -55,7 +61,7 @@ __pthread_mutex_unlock (pthread_mutex_t *mutex)
return EPERM;
}
- if (mutex->attr->mutex_type == PTHREAD_MUTEX_RECURSIVE)
+ if (attr->mutex_type == PTHREAD_MUTEX_RECURSIVE)
if (--mutex->locks > 0)
{
__pthread_spin_unlock (&mutex->__lock);
@@ -82,7 +88,7 @@ __pthread_mutex_unlock (pthread_mutex_t *mutex)
#ifndef NDEBUG
# if !defined (ALWAYS_TRACK_MUTEX_OWNER)
- if (mutex->attr && mutex->attr->mutex_type != PTHREAD_MUTEX_NORMAL)
+ if (attr && attr->mutex_type != PTHREAD_MUTEX_NORMAL)
# endif
{
mutex->owner = wakeup;
diff --git a/libpthread/sysdeps/generic/pt-mutexattr.c b/libpthread/sysdeps/generic/pt-mutexattr.c
index d80a7d74..5ebde6ea 100644
--- a/libpthread/sysdeps/generic/pt-mutexattr.c
+++ b/libpthread/sysdeps/generic/pt-mutexattr.c
@@ -28,6 +28,14 @@ const struct __pthread_mutexattr __pthread_default_mutexattr =
mutex_type: PTHREAD_MUTEX_DEFAULT
};
+const struct __pthread_mutexattr __pthread_errorcheck_mutexattr =
+{
+ prioceiling: 0,
+ protocol: PTHREAD_PRIO_NONE,
+ pshared: PTHREAD_PROCESS_PRIVATE,
+ mutex_type: PTHREAD_MUTEX_ERRORCHECK
+};
+
const struct __pthread_mutexattr __pthread_recursive_mutexattr =
{
prioceiling: 0,
diff --git a/libpthread/sysdeps/hurd/pt-kill.c b/libpthread/sysdeps/hurd/pt-kill.c
index f970e065..d204e3f6 100644
--- a/libpthread/sysdeps/hurd/pt-kill.c
+++ b/libpthread/sysdeps/hurd/pt-kill.c
@@ -39,6 +39,9 @@ pthread_kill (pthread_t thread, int sig)
ss = _hurd_thread_sigstate (pthread->kernel_thread);
assert (ss);
+ if (!sig)
+ return 0;
+
detail.exc = 0;
detail.code = sig;
detail.error = 0;
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-18 00:38:01 +0000