jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

improve/debloat mutex unlock error checking in pthread_cond_wait

Browse source 
we're not required to check this except for error-checking mutexes,
but it doesn't hurt. the new test is actually simpler/lighter, and it
also eliminates the need to later check that pthread_mutex_unlock
succeeds.
This commit is contained in:
Rich Felker 2011-09-27 18:22:31 -04:00
commit bc244533cc
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/thread/pthread_cond_timedwait.c
View file

@ -37,8 +37,8 @@ int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t
struct cm cm = { .c=c, .m=m }; struct cm cm = { .c=c, .m=m };
int r, e=0, seq; int r, e=0, seq;
if ((m->_m_type&3) == PTHREAD_MUTEX_ERRORCHECK && if (m->_m_type && (m->_m_lock&INT_MAX) != __pthread_self()->tid)
(m->_m_lock&INT_MAX) != __pthread_self()->tid) return EPERM; return EPERM;
if (ts && ts->tv_nsec >= 1000000000UL) if (ts && ts->tv_nsec >= 1000000000UL)
return EINVAL; return EINVAL;
@ -58,7 +58,7 @@ int pthread_cond_timedwait(pthread_cond_t *c, pthread_mutex_t *m, const struct t
seq = c->_c_seq; seq = c->_c_seq;
if ((r=pthread_mutex_unlock(m))) return r; pthread_mutex_unlock(m);
do e = __timedwait(&c->_c_seq, seq, c->_c_clock, ts, cleanup, &cm, 0); do e = __timedwait(&c->_c_seq, seq, c->_c_clock, ts, cleanup, &cm, 0);
while (c->_c_seq == seq && (!e || e==EINTR)); while (c->_c_seq == seq && (!e || e==EINTR));