diff options
| author | Rich Felker <dalias@aerifal.cx> | 2011-02-17 17:16:20 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2011-02-17 17:16:20 -0500 |
| commit | e882756311c7b06e59fcc8e582f03852b7dcfd30 (patch) | |
| tree | aead1d2311ed1d3b68dd2b1f02ff6eed2c5ea2ea /src/thread/pthread_mutex_timedlock.c | |
| parent | 4fd159568aa1852fbbe6c11d35ccecaec3715d7c (diff) | |
| download | musl-e882756311c7b06e59fcc8e582f03852b7dcfd30.tar.gz musl-e882756311c7b06e59fcc8e582f03852b7dcfd30.tar.xz musl-e882756311c7b06e59fcc8e582f03852b7dcfd30.zip | |
reorganize pthread data structures and move the definitions to alltypes.h
this allows sys/types.h to provide the pthread types, as required by POSIX. this design also facilitates forcing ABI-compatible sizes in the arch-specific alltypes.h, while eliminating the need for developers changing the internals of the pthread types to poke around with arch-specific headers they may not be able to test.
Diffstat (limited to 'src/thread/pthread_mutex_timedlock.c')
| -rw-r--r-- | src/thread/pthread_mutex_timedlock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/thread/pthread_mutex_timedlock.c b/src/thread/pthread_mutex_timedlock.c index 5dfad94f..20ce0128 100644 --- a/src/thread/pthread_mutex_timedlock.c +++ b/src/thread/pthread_mutex_timedlock.c @@ -4,12 +4,12 @@ int pthread_mutex_timedlock(pthread_mutex_t *m, const struct timespec *at) { int r, w=0; while ((r=pthread_mutex_trylock(m)) == EBUSY) { - if (!w) a_inc(&m->__waiters), w++; - if (__timedwait(&m->__lock, 1, CLOCK_REALTIME, at, 0) == ETIMEDOUT) { - if (w) a_dec(&m->__waiters); + if (!w) a_inc(&m->_m_waiters), w++; + if (__timedwait(&m->_m_lock, 1, CLOCK_REALTIME, at, 0) == ETIMEDOUT) { + if (w) a_dec(&m->_m_waiters); return ETIMEDOUT; } } - if (w) a_dec(&m->__waiters); + if (w) a_dec(&m->_m_waiters); return r; } |