drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* thread.cc (pthread_mutex::unlock): Don't attempt to unlock if there is an 

error.
This commit is contained in:
Christopher Faylor 2010-02-23 07:12:38 +00:00
parent dbf41aeeff
commit 7414c24a77
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,8 @@
2010-02-23 Christopher Faylor <me+cygwin@cgf.cx>
* thread.cc (pthread_mutex::unlock): Don't attempt to unlock if there
is an error.
2010-02-22 Christopher Faylor <me+cygwin@cgf.cx> 2010-02-22 Christopher Faylor <me+cygwin@cgf.cx>
* include/sys/strace.h: Define _STRACE_SPECIAL. * include/sys/strace.h: Define _STRACE_SPECIAL.

10
winsup/cygwin/thread.cc
View File

@ -1614,15 +1614,15 @@ pthread_mutex::lock ()
int int
pthread_mutex::unlock () pthread_mutex::unlock ()
{ {
int res; int res = 0;
pthread_t self = ::pthread_self (); pthread_t self = ::pthread_self ();
if (type == PTHREAD_MUTEX_NORMAL) if (type == PTHREAD_MUTEX_NORMAL)
/* no error checking */; /* no error checking */;
else if (no_owner ()) else if (no_owner ())
return type == PTHREAD_MUTEX_ERRORCHECK ? EINVAL : 0; res = type == PTHREAD_MUTEX_ERRORCHECK ? EINVAL : 0;
else if (!pthread::equal (owner, self)) else if (!pthread::equal (owner, self))
res = EPERM; res = EPERM;
if (recursion_counter > 0 && --recursion_counter == 0) if (!res && recursion_counter > 0 && --recursion_counter == 0)
/* Don't try to unlock anything if recursion_counter == 0. /* Don't try to unlock anything if recursion_counter == 0.
This means the mutex was never locked or that we've forked. */ This means the mutex was never locked or that we've forked. */
{ {
@ -1635,8 +1635,8 @@ pthread_mutex::unlock ()
res = 0; res = 0;
} }
pthread_printf ("mutex %p, owner %p, self %p, lock_counter %d, recursion_counter %d, res %d", pthread_printf ("mutex %p, owner %p, self %p, lock_counter %d, recursion_counter %d, type %d, res %d",
this, owner, self, lock_counter, recursion_counter, res); this, owner, self, lock_counter, recursion_counter, type, res);
return res; return res;
} }