qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BZ #4392] 

* pthread_mutex_trylock.c (__pthread_mutex_trylock): Treat error
	check mutexes like normal mutexes.
This commit is contained in:
Ulrich Drepper 2007-04-28 04:23:56 +00:00
parent f672076efa
commit 1bb5f5a1c5
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nptl/ChangeLog
View File

@ -1,5 +1,9 @@
2007-04-27 Ulrich Drepper <drepper@redhat.com> 2007-04-27 Ulrich Drepper <drepper@redhat.com>
[BZ #4392]
* pthread_mutex_trylock.c (__pthread_mutex_trylock): Treat error
check mutexes like normal mutexes.
[BZ #4306] [BZ #4306]
* sysdeps/unix/sysv/linux/timer_create.c (timer_create): * sysdeps/unix/sysv/linux/timer_create.c (timer_create):
Initialize the whole sigevent structure to appease valgrind. Initialize the whole sigevent structure to appease valgrind.

9
nptl/pthread_mutex_trylock.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. /* Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@ -58,12 +58,6 @@ __pthread_mutex_trylock (mutex)
break; break;
case PTHREAD_MUTEX_ERRORCHECK_NP: case PTHREAD_MUTEX_ERRORCHECK_NP:
/* Check whether we already hold the mutex. */
if (__builtin_expect (mutex->__data.__owner == id, 0))
return EDEADLK;
/* FALLTHROUGH */
case PTHREAD_MUTEX_TIMED_NP: case PTHREAD_MUTEX_TIMED_NP:
case PTHREAD_MUTEX_ADAPTIVE_NP: case PTHREAD_MUTEX_ADAPTIVE_NP:
/* Normal mutex. */ /* Normal mutex. */
@ -76,7 +70,6 @@ __pthread_mutex_trylock (mutex)
return 0; return 0;
case PTHREAD_MUTEX_ROBUST_RECURSIVE_NP: case PTHREAD_MUTEX_ROBUST_RECURSIVE_NP:
case PTHREAD_MUTEX_ROBUST_ERRORCHECK_NP: case PTHREAD_MUTEX_ROBUST_ERRORCHECK_NP:
case PTHREAD_MUTEX_ROBUST_NORMAL_NP: case PTHREAD_MUTEX_ROBUST_NORMAL_NP: