diff options
| author | Neal H. Walfield <neal@gnu.org> | 2007-11-20 16:23:24 +0000 |
|---|---|---|
| committer | Thomas Schwinge <tschwinge@gnu.org> | 2009-04-07 23:05:35 +0200 |
| commit | e16179334211cd7e2877197140b06b83e2f03733 (patch) | |
| tree | 25ffab176418a96477e2e95cfc5540f839bfec22 /pthread/pt-dealloc.c | |
| parent | 426e7e7edf67380ec5afc9791a9541b0f8e2c452 (diff) | |
| parent | 0697fd051821d7b44b3c9ab2face57438e1a764a (diff) | |
2007-11-20 Neal H. Walfield <neal@gnu.org>
Merge changes from mainline Hurd. Update L4 bits to compile with
those changes.
* sysdeps/l4/pt-block.c (__pthread_block): Call l4_receive, not
L4_Receive.
* sysdeps/l4/pt-create-np.c (pthread_create_from_l4_tid_np): Don't
pass TID to __pthread_create_internal. Emit a warning.
* sysdeps/l4/pt-stack-alloc.c (allocate_page): Remove function.
(__pthread_stack_alloc): Don't require that STACKSIZE is equal to
__pthread_stacksize. Call mmap.
* sysdeps/l4/pt-thread-halt.c (__pthread_thread_halt): Take
additional argument, need_dealloc. Call __pthread_dealloc. Stop
the thread.
* sysdeps/l4/hurd/pt-sysdep.c (init_routine): When calling
__pthread_create_internal, don't pass the tid.
* tests/test-1.c (main): Use pthread_mutex_init, not
PTHREAD_MUTEX_INITIALIZER.
* pthread/pt-alloc.c: Don't include <bits/atomic.h>. Include
<atomic.h>.
(__pthread_free_threads): Make it an atomicptr_t, not an
__atomicptr_t.
(__pthread_alloc): Don't use __atomicptr_compare_and_swap, use
atomic_compare_and_exchange_val_acq.
* pthread/pt-create.c: Don't include <bits/atomic.h>. Include
<atomic.h>.
(__pthread_total): Make it an atomic_fast32_t, not an __atomic_t.
(__pthread_create_internal): Use atomic_increment and
atomic_decrement, not __atomic_inc and __atomic_dec.
* pthread/pt-dealloc.c: Don't include <bits/atomic.h>. Include
<atomic.h>.
(__pthread_free_threads): Make it an atomicptr_t, not an
__atomicptr_t.
(__pthread_dealloc): Use atomic_compare_and_exchange_val_acq, not
__atomicptr_compare_and_swap.
* pthread/pt-exit.c: Don't include <bits/atomic.h>. Include
<atomic.h>.
(pthread_exit): Use atomic_decrement_and_test, not
__atomic_dec_and_test.
* pthread/pt-internal.h: Don't include <bits/atomic.h>. Include
<atomic.h>.
(__pthread_total): Make it an atomic_fast32_t, not an __atomic_t.
* sysdeps/powerpc/bits/atomic.h: Remove file.
* sysdeps/ia32/bits/atomic.h: Likewise.
Diffstat (limited to 'pthread/pt-dealloc.c')
| -rw-r--r-- | pthread/pt-dealloc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pthread/pt-dealloc.c b/pthread/pt-dealloc.c index f89f354..879608b 100644 --- a/pthread/pt-dealloc.c +++ b/pthread/pt-dealloc.c @@ -26,7 +26,7 @@ #include <atomic.h> /* List of thread structures corresponding to free thread IDs. */ -extern uatomicptr_t __pthread_free_threads; +extern atomicptr_t __pthread_free_threads; /* Deallocate the thread structure for PTHREAD and the resources associated with it. */ @@ -55,8 +55,10 @@ __pthread_dealloc (struct __pthread *pthread) { pthread->next = (struct __pthread *)__pthread_free_threads; if (atomic_compare_and_exchange_val_acq (&__pthread_free_threads, - pthread->next, pthread)) - return; + (uintptr_t) pthread, + (uintptr_t) pthread->next) + == (uintptr_t) pthread->next) + break; } /* NOTREACHED */ |