niansa-misc/musl
1
0
Fork 0
mirror of git://git.musl-libc.org/musl synced 2025-03-06 20:48:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

next step making barrier self-sync'd destruction safe

Browse source 
i think this works, but it can be simplified. (next step)
This commit is contained in:
Rich Felker 2011-09-28 18:00:02 -04:00
parent 8f4a115e7d
commit 95b1479672
2 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/thread/pthread_barrier_destroy.c
View file

@ -5,8 +5,12 @@ void __vm_lock(int), __vm_unlock(void);
int pthread_barrier_destroy(pthread_barrier_t *b) int pthread_barrier_destroy(pthread_barrier_t *b)
{ {
if (b->_b_limit < 0) { if (b->_b_limit < 0) {
int seq = b->_b_seq; if (b->_b_lock) {
if (seq & 1) __wait(&b->_b_seq, 0, seq, 0); int v;
a_or(&b->_b_lock, INT_MIN);
while ((v = b->_b_lock) & INT_MAX)
__wait(&b->_b_lock, 0, v, 0);
}
__vm_lock(-1); __vm_lock(-1);
__vm_unlock(); __vm_unlock();
} }

16
src/thread/pthread_barrier_wait.c
View file

@ -23,11 +23,12 @@ static int pshared_barrier_wait(pthread_barrier_t *b)
int limit = (b->_b_limit & INT_MAX) + 1; int limit = (b->_b_limit & INT_MAX) + 1;
int seq; int seq;
int ret = 0; int ret = 0;
int v, w;
if (limit==1) return PTHREAD_BARRIER_SERIAL_THREAD; if (limit==1) return PTHREAD_BARRIER_SERIAL_THREAD;
while (a_swap(&b->_b_lock, 1)) while ((v=a_cas(&b->_b_lock, 0, limit)))
__wait(&b->_b_lock, &b->_b_waiters, 1, 0); __wait(&b->_b_lock, &b->_b_waiters, v, 0);
seq = b->_b_seq; seq = b->_b_seq;
@ -46,12 +47,19 @@ static int pshared_barrier_wait(pthread_barrier_t *b)
if (a_fetch_add(&b->_b_count, -1)==1) { if (a_fetch_add(&b->_b_count, -1)==1) {
b->_b_seq++; b->_b_seq++;
__wake(&b->_b_seq, -1, 0); __wake(&b->_b_seq, -1, 0);
a_store(&b->_b_lock, 0);
if (b->_b_waiters) __wake(&b->_b_lock, 1, 0);
} else { } else {
__wait(&b->_b_seq, 0, seq+1, 0); __wait(&b->_b_seq, 0, seq+1, 0);
} }
/* Perform a recursive unlock suitable for self-sync'd destruction */
do {
v = b->_b_lock;
w = b->_b_waiters;
} while (a_cas(&b->_b_lock, v, v-1 & INT_MAX) != v);
if (v==INT_MIN+1 || (v==1 && w))
__wake(&b->_b_lock, 1, 0);
__vm_unlock(); __vm_unlock();
return ret; return ret;