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.
This commit is contained in:
Rich Felker
2011-02-17 17:16:20 -05:00
parent 4fd159568a
commit e882756311
28 changed files with 158 additions and 128 deletions

View File

@ -2,27 +2,27 @@
int pthread_mutex_trylock(pthread_mutex_t *m)
{
if (m->__type == PTHREAD_MUTEX_RECURSIVE) {
if (m->_m_type == PTHREAD_MUTEX_RECURSIVE) {
pthread_t self = pthread_self();
if (m->__owner == self) {
if ((unsigned)m->__lock >= INT_MAX) return EAGAIN;
a_inc(&m->__lock);
if (m->_m_owner == self->tid) {
if ((unsigned)m->_m_lock >= INT_MAX) return EAGAIN;
a_inc(&m->_m_lock);
return 0;
}
if (a_fetch_add(&m->__lock, 1)) {
if (a_fetch_add(&m->__lock, -1)==1 && m->__waiters)
__wake(&m->__lock, 1, 0);
if (a_fetch_add(&m->_m_lock, 1)) {
if (a_fetch_add(&m->_m_lock, -1)==1 && m->_m_waiters)
__wake(&m->_m_lock, 1, 0);
return EBUSY;
}
m->__owner = self;
m->_m_owner = self->tid;
return 0;
}
if (a_xchg(&m->__lock, 1))
if (m->__type == PTHREAD_MUTEX_ERRORCHECK
&& m->__owner == pthread_self()) return EDEADLK;
if (a_xchg(&m->_m_lock, 1))
if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK
&& m->_m_owner == pthread_self()->tid) return EDEADLK;
else return EBUSY;
if (m->__type == PTHREAD_MUTEX_ERRORCHECK)
m->__owner = pthread_self();
if (m->_m_type == PTHREAD_MUTEX_ERRORCHECK)
m->_m_owner = pthread_self()->tid;
return 0;
}