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

correct error returns for error-checking mutexes

Browse source
This commit is contained in:
Rich Felker 2011-03-16 16:25:00 -04:00
commit d4f9e0b364
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/thread/pthread_mutex_lock.c
View file

@ -3,7 +3,11 @@
int pthread_mutex_lock(pthread_mutex_t *m) int pthread_mutex_lock(pthread_mutex_t *m)
{ {
int r; int r;
while ((r=pthread_mutex_trylock(m)) == EBUSY) while ((r=pthread_mutex_trylock(m)) == EBUSY) {
if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK
&& m->_m_owner == pthread_self()->tid)
return EDEADLK;
__wait(&m->_m_lock, &m->_m_waiters, 1, 0); __wait(&m->_m_lock, &m->_m_waiters, 1, 0);
}
return r; return r;
} }

2
src/thread/pthread_mutex_trylock.c
View file

@ -11,7 +11,7 @@ int pthread_mutex_trylock(pthread_mutex_t *m)
if (m->_m_owner == tid) { if (m->_m_owner == tid) {
if (m->_m_type != PTHREAD_MUTEX_RECURSIVE) if (m->_m_type != PTHREAD_MUTEX_RECURSIVE)
return EDEADLK; return EBUSY;
if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN; if ((unsigned)m->_m_count >= INT_MAX) return EAGAIN;
m->_m_count++; m->_m_count++;
return 0; return 0;