summaryrefslogtreecommitdiff
path: root/src/thread/pthread_rwlock_timedwrlock.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-02-17 17:16:20 -0500
committerRich Felker <dalias@aerifal.cx>2011-02-17 17:16:20 -0500
commite882756311c7b06e59fcc8e582f03852b7dcfd30 (patch)
treeaead1d2311ed1d3b68dd2b1f02ff6eed2c5ea2ea /src/thread/pthread_rwlock_timedwrlock.c
parent4fd159568aa1852fbbe6c11d35ccecaec3715d7c (diff)
downloadmusl-e882756311c7b06e59fcc8e582f03852b7dcfd30.tar.gz
musl-e882756311c7b06e59fcc8e582f03852b7dcfd30.tar.bz2
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_rwlock_timedwrlock.c')
-rw-r--r--src/thread/pthread_rwlock_timedwrlock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/thread/pthread_rwlock_timedwrlock.c b/src/thread/pthread_rwlock_timedwrlock.c
index 9f749648..96827749 100644
--- a/src/thread/pthread_rwlock_timedwrlock.c
+++ b/src/thread/pthread_rwlock_timedwrlock.c
@@ -4,14 +4,14 @@ int pthread_rwlock_timedwrlock(pthread_rwlock_t *rw, const struct timespec *at)
{
int nr, *p, w=0;
while (pthread_rwlock_trywrlock(rw)==EAGAIN) {
- if (!w) a_inc(&rw->__waiters), w++;
- if ((nr=rw->__readers)) p = &rw->__readers;
- else nr=1, p = &rw->__wrlock;
+ if (!w) a_inc(&rw->_rw_waiters), w++;
+ if ((nr=rw->_rw_readers)) p = &rw->_rw_readers;
+ else nr=1, p = &rw->_rw_wrlock;
if (__timedwait(p, nr, CLOCK_REALTIME, at, 0)==ETIMEDOUT) {
- if (w) a_dec(&rw->__waiters);
+ if (w) a_dec(&rw->_rw_waiters);
return ETIMEDOUT;
}
}
- if (w) a_dec(&rw->__waiters);
+ if (w) a_dec(&rw->_rw_waiters);
return 0;
}