diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-03-17 12:21:32 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-03-17 12:21:32 -0400 |
| commit | b1c43161c2b37e35eae60fa61621a24a5d820d83 (patch) | |
| tree | b6c532f959850f42ad219d87b721a587973c6654 /src/thread/pthread_mutex_lock.c | |
| parent | e914f8b7ec79f622fa3b017af434642f61d45ce8 (diff) | |
| download | musl-b1c43161c2b37e35eae60fa61621a24a5d820d83.tar.gz musl-b1c43161c2b37e35eae60fa61621a24a5d820d83.tar.xz musl-b1c43161c2b37e35eae60fa61621a24a5d820d83.zip | |
unify lock and owner fields of mutex structure
this change is necessary to free up one slot in the mutex structure so that we can use doubly-linked lists in the implementation of robust mutexes.
Diffstat (limited to 'src/thread/pthread_mutex_lock.c')
| -rw-r--r-- | src/thread/pthread_mutex_lock.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/thread/pthread_mutex_lock.c b/src/thread/pthread_mutex_lock.c index 82556141..56111ec8 100644 --- a/src/thread/pthread_mutex_lock.c +++ b/src/thread/pthread_mutex_lock.c @@ -4,10 +4,11 @@ int pthread_mutex_lock(pthread_mutex_t *m) { int r; while ((r=pthread_mutex_trylock(m)) == EBUSY) { + if (!(r=m->_m_lock)) continue; if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK - && m->_m_owner == pthread_self()->tid) + && r == pthread_self()->tid) return EDEADLK; - __wait(&m->_m_lock, &m->_m_waiters, 1, 0); + __wait(&m->_m_lock, &m->_m_waiters, r, 0); } return r; } |