mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-17 02:20:10 +00:00
5bd8a24966
* pthread_mutex_lock.c: Use it instead of PTHREAD_MUTEX_PSHARED when dealing with robust mutexes. * pthread_mutex_timedlock.c: Likewise. * pthread_mutex_trylock.c: Likewise. * pthread_mutex_unlock.c: Likewise. * sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c: Likewise. 2007-08-06 Jakub Jelinek <jakub@redhat.com> * pthreadP.h (PTHREAD_MUTEX_PSHARED_BIT): Define. (PTHREAD_MUTEX_TYPE): Mask __kind with 127. (PTHREAD_MUTEX_PSHARED): Define. * pthread_mutex_init.c (__pthread_mutex_init): Set PTHREAD_MUTEX_PSHARED_BIT for pshared or robust mutexes. * pthread_mutex_lock.c (LLL_MUTEX_LOCK): Take mutex as argument instead of its __data.__lock field, pass PTHREAD_MUTEX_PSHARED as second argument to lll_lock. (LLL_MUTEX_TRYLOCK): Take mutex as argument instead of its __data.__lock field. (LLL_ROBUST_MUTEX_LOCK): Take mutex as argument instead of its __data.__lock field, pass PTHREAD_MUTEX_PSHARED as second argument to lll_robust_lock. (__pthread_mutex_lock): Update LLL_MUTEX_LOCK, LLL_MUTEX_TRYLOCK, LLL_ROBUST_MUTEX_LOCK users, use PTHREAD_MUTEX_TYPE (mutex) instead of mutex->__data.__kind directly, pass PTHREAD_MUTEX_PSHARED (mutex) to lll_unlock and lll_futex_wait. * pthread_mutex_trylock.c (__pthread_mutex_trylock): Use PTHREAD_MUTEX_TYPE (mutex) instead of mutex->__data.__kind directly, pass PTHREAD_MUTEX_PSHARED (mutex) to lll_unlock. (pthread_mutex_timedlock): Pass PTHREAD_MUTEX_PSHARED (mutex) to lll_timedlock, lll_robust_timedlock, lll_unlock and lll_futex_timed_wait. Use PTHREAD_MUTEX_TYPE (mutex) instead of mutex->__data.__kind directly. * pthread_mutex_timedlock.c (pthread_mutex_timedlock): Pass PTHREAD_MUTEX_PSHARED (mutex) to lll_timedlock, lll_robust_timedlock, lll_unlock and lll_futex_timed_wait. Use PTHREAD_MUTEX_TYPE (mutex) instead of mutex->__data.__kind directly. * pthread_mutex_unlock.c (__pthread_mutex_unlock_usercnt): Pass PTHREAD_MUTEX_PSHARED (mutex) to lll_unlock, lll_robust_unlock and lll_futex_wake. * pthread_mutex_setprioceiling.c (pthread_mutex_setprioceiling): Pass PTHREAD_MUTEX_PSHARED (mutex) to lll_futex_wait and lll_futex_wake. Use PTHREAD_MUTEX_TYPE (mutex) instead of mutex->__data.__kind directly. * sysdeps/unix/sysv/linux/pthread_mutex_cond_lock.c (LLL_MUTEX_LOCK): Take mutex as argument instead of its __data.__lock field, pass PTHREAD_MUTEX_PSHARED as second argument to lll_cond_lock. (LLL_MUTEX_TRYLOCK): Take mutex as argument instead of its __data.__lock field. (LLL_ROBUST_MUTEX_LOCK): Take mutex as argument instead of its __data.__lock field, pass PTHREAD_MUTEX_PSHARED as second argument to lll_robust_cond_lock. * pthread_cond_broadcast.c (__pthread_cond_broadcast): Add pshared variable, pass it to lll_lock, lll_unlock, lll_futex_requeue and lll_futex_wake. Don't use lll_futex_requeue if dependent mutex has PTHREAD_MUTEX_PSHARED_BIT bit set in its __data.__kind. * pthread_cond_destroy.c (__pthread_cond_destroy): Add pshared variable, pass it to lll_lock, lll_unlock, lll_futex_wake and lll_futex_wait. * pthread_cond_signal.c (__pthread_cond_signal): Add pshared variable, pass it to lll_lock, lll_unlock, lll_futex_wake_unlock and lll_futex_wake. * pthread_cond_timedwait.c (__pthread_cond_wait): Add pshared variable, pass it to lll_lock, lll_unlock, lll_futex_timedwait and lll_futex_wake. * pthread_cond_wait.c (__condvar_cleanup, __pthread_cond_wait): Add pshared variable, pass it to lll_lock, lll_unlock, lll_futex_wait and lll_futex_wake. * sysdeps/unix/sysv/linux/alpha/lowlevellock.h (lll_futex_requeue, lll_futex_wake_unlock): Add private argument, use __lll_private_flag macro. * sysdeps/unix/sysv/linux/ia64/lowlevellock.h (lll_futex_requeue, lll_futex_wake_unlock): Likewise. * sysdeps/unix/sysv/linux/powerpc/lowlevellock.h (lll_futex_requeue): Likewise. * sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_futex_requeue, lll_futex_wake_unlock): Likewise. * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h (lll_futex_requeue): Likewise. * sysdeps/unix/sysv/linux/s390/lowlevellock.h (lll_futex_requeue, lll_futex_wake_unlock): Likewise. (lll_futex_wake): Fix a typo. * sysdeps/unix/sysv/linux/pthread-pi-defines.sym (PS_BIT): Add. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.S (__pthread_cond_broadcast): Pass LLL_PRIVATE to lll_* and or FUTEX_PRIVATE_FLAG into SYS_futex op if cv is process private. Don't use FUTEX_CMP_REQUEUE if dep_mutex is not process private. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_signal.S (__pthread_cond_signal): Pass LLL_PRIVATE to lll_* and or FUTEX_PRIVATE_FLAG into SYS_futex op if cv is process private. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_timedwait.S (__pthread_cond_timedwait): Likewise. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_wait.S: (__condvar_cleanup, __pthread_cond_wait): Likewise.
268 lines
7.7 KiB
C
268 lines
7.7 KiB
C
/* Copyright (C) 2002, 2003, 2005, 2006, 2007 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, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include "pthreadP.h"
|
|
#include <lowlevellock.h>
|
|
|
|
|
|
int
|
|
internal_function attribute_hidden
|
|
__pthread_mutex_unlock_usercnt (mutex, decr)
|
|
pthread_mutex_t *mutex;
|
|
int decr;
|
|
{
|
|
int newowner = 0;
|
|
|
|
switch (__builtin_expect (PTHREAD_MUTEX_TYPE (mutex),
|
|
PTHREAD_MUTEX_TIMED_NP))
|
|
{
|
|
case PTHREAD_MUTEX_RECURSIVE_NP:
|
|
/* Recursive mutex. */
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
goto normal;
|
|
|
|
case PTHREAD_MUTEX_ERRORCHECK_NP:
|
|
/* Error checking mutex. */
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid)
|
|
|| ! lll_islocked (mutex->__data.__lock))
|
|
return EPERM;
|
|
/* FALLTHROUGH */
|
|
|
|
case PTHREAD_MUTEX_TIMED_NP:
|
|
case PTHREAD_MUTEX_ADAPTIVE_NP:
|
|
/* Always reset the owner field. */
|
|
normal:
|
|
mutex->__data.__owner = 0;
|
|
if (decr)
|
|
/* One less user. */
|
|
--mutex->__data.__nusers;
|
|
|
|
/* Unlock. */
|
|
lll_unlock (mutex->__data.__lock, PTHREAD_MUTEX_PSHARED (mutex));
|
|
break;
|
|
|
|
case PTHREAD_MUTEX_ROBUST_RECURSIVE_NP:
|
|
/* Recursive mutex. */
|
|
if ((mutex->__data.__lock & FUTEX_TID_MASK)
|
|
== THREAD_GETMEM (THREAD_SELF, tid)
|
|
&& __builtin_expect (mutex->__data.__owner
|
|
== PTHREAD_MUTEX_INCONSISTENT, 0))
|
|
{
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return ENOTRECOVERABLE;
|
|
|
|
goto notrecoverable;
|
|
}
|
|
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
|
|
goto robust;
|
|
|
|
case PTHREAD_MUTEX_ROBUST_ERRORCHECK_NP:
|
|
case PTHREAD_MUTEX_ROBUST_NORMAL_NP:
|
|
case PTHREAD_MUTEX_ROBUST_ADAPTIVE_NP:
|
|
if ((mutex->__data.__lock & FUTEX_TID_MASK)
|
|
!= THREAD_GETMEM (THREAD_SELF, tid)
|
|
|| ! lll_islocked (mutex->__data.__lock))
|
|
return EPERM;
|
|
|
|
/* If the previous owner died and the caller did not succeed in
|
|
making the state consistent, mark the mutex as unrecoverable
|
|
and make all waiters. */
|
|
if (__builtin_expect (mutex->__data.__owner
|
|
== PTHREAD_MUTEX_INCONSISTENT, 0))
|
|
notrecoverable:
|
|
newowner = PTHREAD_MUTEX_NOTRECOVERABLE;
|
|
|
|
robust:
|
|
/* Remove mutex from the list. */
|
|
THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending,
|
|
&mutex->__data.__list.__next);
|
|
DEQUEUE_MUTEX (mutex);
|
|
|
|
mutex->__data.__owner = newowner;
|
|
if (decr)
|
|
/* One less user. */
|
|
--mutex->__data.__nusers;
|
|
|
|
/* Unlock. */
|
|
lll_robust_unlock (mutex->__data.__lock,
|
|
PTHREAD_ROBUST_MUTEX_PSHARED (mutex));
|
|
|
|
THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL);
|
|
break;
|
|
|
|
case PTHREAD_MUTEX_PI_RECURSIVE_NP:
|
|
/* Recursive mutex. */
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
goto continue_pi;
|
|
|
|
case PTHREAD_MUTEX_PI_ROBUST_RECURSIVE_NP:
|
|
/* Recursive mutex. */
|
|
if ((mutex->__data.__lock & FUTEX_TID_MASK)
|
|
== THREAD_GETMEM (THREAD_SELF, tid)
|
|
&& __builtin_expect (mutex->__data.__owner
|
|
== PTHREAD_MUTEX_INCONSISTENT, 0))
|
|
{
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return ENOTRECOVERABLE;
|
|
|
|
goto pi_notrecoverable;
|
|
}
|
|
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
|
|
goto continue_pi;
|
|
|
|
case PTHREAD_MUTEX_PI_ERRORCHECK_NP:
|
|
case PTHREAD_MUTEX_PI_NORMAL_NP:
|
|
case PTHREAD_MUTEX_PI_ADAPTIVE_NP:
|
|
case PTHREAD_MUTEX_PI_ROBUST_ERRORCHECK_NP:
|
|
case PTHREAD_MUTEX_PI_ROBUST_NORMAL_NP:
|
|
case PTHREAD_MUTEX_PI_ROBUST_ADAPTIVE_NP:
|
|
if ((mutex->__data.__lock & FUTEX_TID_MASK)
|
|
!= THREAD_GETMEM (THREAD_SELF, tid)
|
|
|| ! lll_islocked (mutex->__data.__lock))
|
|
return EPERM;
|
|
|
|
/* If the previous owner died and the caller did not succeed in
|
|
making the state consistent, mark the mutex as unrecoverable
|
|
and make all waiters. */
|
|
if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) != 0
|
|
&& __builtin_expect (mutex->__data.__owner
|
|
== PTHREAD_MUTEX_INCONSISTENT, 0))
|
|
pi_notrecoverable:
|
|
newowner = PTHREAD_MUTEX_NOTRECOVERABLE;
|
|
|
|
continue_pi:
|
|
if ((mutex->__data.__kind & PTHREAD_MUTEX_ROBUST_NORMAL_NP) != 0)
|
|
{
|
|
/* Remove mutex from the list.
|
|
Note: robust PI futexes are signaled by setting bit 0. */
|
|
THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending,
|
|
(void *) (((uintptr_t) &mutex->__data.__list.__next)
|
|
| 1));
|
|
DEQUEUE_MUTEX (mutex);
|
|
}
|
|
|
|
mutex->__data.__owner = newowner;
|
|
if (decr)
|
|
/* One less user. */
|
|
--mutex->__data.__nusers;
|
|
|
|
/* Unlock. */
|
|
if ((mutex->__data.__lock & FUTEX_WAITERS) != 0
|
|
|| atomic_compare_and_exchange_bool_acq (&mutex->__data.__lock, 0,
|
|
THREAD_GETMEM (THREAD_SELF,
|
|
tid)))
|
|
{
|
|
INTERNAL_SYSCALL_DECL (__err);
|
|
INTERNAL_SYSCALL (futex, __err, 2, &mutex->__data.__lock,
|
|
FUTEX_UNLOCK_PI);
|
|
}
|
|
|
|
THREAD_SETMEM (THREAD_SELF, robust_head.list_op_pending, NULL);
|
|
break;
|
|
|
|
case PTHREAD_MUTEX_PP_RECURSIVE_NP:
|
|
/* Recursive mutex. */
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid))
|
|
return EPERM;
|
|
|
|
if (--mutex->__data.__count != 0)
|
|
/* We still hold the mutex. */
|
|
return 0;
|
|
goto pp;
|
|
|
|
case PTHREAD_MUTEX_PP_ERRORCHECK_NP:
|
|
/* Error checking mutex. */
|
|
if (mutex->__data.__owner != THREAD_GETMEM (THREAD_SELF, tid)
|
|
|| (mutex->__data.__lock & ~ PTHREAD_MUTEX_PRIO_CEILING_MASK) == 0)
|
|
return EPERM;
|
|
/* FALLTHROUGH */
|
|
|
|
case PTHREAD_MUTEX_PP_NORMAL_NP:
|
|
case PTHREAD_MUTEX_PP_ADAPTIVE_NP:
|
|
/* Always reset the owner field. */
|
|
pp:
|
|
mutex->__data.__owner = 0;
|
|
|
|
if (decr)
|
|
/* One less user. */
|
|
--mutex->__data.__nusers;
|
|
|
|
/* Unlock. */
|
|
int newval, oldval;
|
|
do
|
|
{
|
|
oldval = mutex->__data.__lock;
|
|
newval = oldval & PTHREAD_MUTEX_PRIO_CEILING_MASK;
|
|
}
|
|
while (atomic_compare_and_exchange_bool_acq (&mutex->__data.__lock,
|
|
newval, oldval));
|
|
|
|
if ((oldval & ~PTHREAD_MUTEX_PRIO_CEILING_MASK) > 1)
|
|
lll_futex_wake (&mutex->__data.__lock, 1,
|
|
PTHREAD_MUTEX_PSHARED (mutex));
|
|
|
|
int oldprio = newval >> PTHREAD_MUTEX_PRIO_CEILING_SHIFT;
|
|
return __pthread_tpp_change_priority (oldprio, -1);
|
|
|
|
default:
|
|
/* Correct code cannot set any other type. */
|
|
return EINVAL;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
|
|
int
|
|
__pthread_mutex_unlock (mutex)
|
|
pthread_mutex_t *mutex;
|
|
{
|
|
return __pthread_mutex_unlock_usercnt (mutex, 1);
|
|
}
|
|
strong_alias (__pthread_mutex_unlock, pthread_mutex_unlock)
|
|
strong_alias (__pthread_mutex_unlock, __pthread_mutex_unlock_internal)
|