diff options
Diffstat (limited to 'pthread')
| -rw-r--r-- | pthread/pt-alloc.c | 18 | ||||
| -rw-r--r-- | pthread/pt-create.c | 8 | ||||
| -rw-r--r-- | pthread/pt-dealloc.c | 12 | ||||
| -rw-r--r-- | pthread/pt-exit.c | 4 | ||||
| -rw-r--r-- | pthread/pt-internal.h | 12 |
5 files changed, 20 insertions, 34 deletions
diff --git a/pthread/pt-alloc.c b/pthread/pt-alloc.c index 6cf9106b..30dcede0 100644 --- a/pthread/pt-alloc.c +++ b/pthread/pt-alloc.c @@ -1,5 +1,5 @@ /* Allocate a new thread structure. - Copyright (C) 2000, 2002, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -25,7 +25,7 @@ #include <pt-internal.h> -#include <atomic.h> +#include <bits/atomic.h> /* This braindamage is necessary because the standard says that some of the threads functions "shall fail" if "No thread could be found @@ -46,7 +46,7 @@ pthread_rwlock_t __pthread_threads_lock; /* List of thread structures corresponding to free thread IDs. */ -atomicptr_t __pthread_free_threads; +__atomicptr_t __pthread_free_threads; static inline error_t initialize_pthread (struct __pthread *new, int recycling) @@ -97,10 +97,8 @@ __pthread_alloc (struct __pthread **pthread) /* Try to re-use a thread structure before creating a new one. */ while ((new = (struct __pthread *)__pthread_free_threads)) { - if (atomic_compare_and_exchange_val_acq (&__pthread_free_threads, - (uintptr_t) new->next, - (uintptr_t) new) - == (uintptr_t) new) + if (__atomicptr_compare_and_swap (&__pthread_free_threads, + new, new->next)) { /* Yes, we managed to get one. The thread number in the thread structure still refers to the correct slot. */ @@ -112,10 +110,8 @@ __pthread_alloc (struct __pthread **pthread) while (1) { new->next = (struct __pthread *)__pthread_free_threads; - if (atomic_compare_and_exchange_val_acq - (&__pthread_free_threads, - (uintptr_t) new, (uintptr_t) new->next) - == (uintptr_t) new->next) + if (__atomicptr_compare_and_swap (&__pthread_free_threads, + new->next, new)) break; } diff --git a/pthread/pt-create.c b/pthread/pt-create.c index 5bb9f1f9..210f9672 100644 --- a/pthread/pt-create.c +++ b/pthread/pt-create.c @@ -22,7 +22,7 @@ #include <pthread.h> #include <signal.h> -#include <atomic.h> +#include <bits/atomic.h> #include <pt-internal.h> @@ -33,7 +33,7 @@ /* The total number of pthreads currently active. This is defined here since it would be really stupid to have a threads-using program that doesn't call `pthread_create'. */ -atomic_fast32_t __pthread_total; +__atomic_t __pthread_total; /* The entry-point for new threads. */ @@ -163,7 +163,7 @@ __pthread_create_internal (struct __pthread **thread, the number of threads from within the new thread isn't an option since this thread might return and call `pthread_exit' before the new thread runs. */ - atomic_increment (&__pthread_total); + __atomic_inc (&__pthread_total); /* Store a pointer to this thread in the thread ID lookup table. We could use __thread_setid, however, we only lock for reading as no @@ -190,7 +190,7 @@ __pthread_create_internal (struct __pthread **thread, failed_starting: __pthread_setid (pthread->thread, NULL); - atomic_decrement (&__pthread_total); + __atomic_dec (&__pthread_total); failed_sigstate: __pthread_sigstate_destroy (pthread); failed_setup: diff --git a/pthread/pt-dealloc.c b/pthread/pt-dealloc.c index 879608b9..1fc7a7b3 100644 --- a/pthread/pt-dealloc.c +++ b/pthread/pt-dealloc.c @@ -23,10 +23,10 @@ #include <pt-internal.h> -#include <atomic.h> +#include <bits/atomic.h> /* List of thread structures corresponding to free thread IDs. */ -extern atomicptr_t __pthread_free_threads; +extern __atomicptr_t __pthread_free_threads; /* Deallocate the thread structure for PTHREAD and the resources associated with it. */ @@ -54,11 +54,9 @@ __pthread_dealloc (struct __pthread *pthread) while (1) { pthread->next = (struct __pthread *)__pthread_free_threads; - if (atomic_compare_and_exchange_val_acq (&__pthread_free_threads, - (uintptr_t) pthread, - (uintptr_t) pthread->next) - == (uintptr_t) pthread->next) - break; + if (__atomicptr_compare_and_swap (&__pthread_free_threads, + pthread->next, pthread)) + return; } /* NOTREACHED */ diff --git a/pthread/pt-exit.c b/pthread/pt-exit.c index a8f85b1a..7484ffd1 100644 --- a/pthread/pt-exit.c +++ b/pthread/pt-exit.c @@ -24,7 +24,7 @@ #include <pt-internal.h> -#include <atomic.h> +#include <bits/atomic.h> /* Terminate the current thread and make STATUS available to any @@ -57,7 +57,7 @@ pthread_exit (void *status) /* Decrease the number of threads. We use an atomic operation to make sure that only the last thread calls `exit'. */ - if (atomic_decrement_and_test (&__pthread_total)) + if (__atomic_dec_and_test (&__pthread_total)) /* We are the last thread. */ exit (0); diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h index 9eb84ed1..0fd7920f 100644 --- a/pthread/pt-internal.h +++ b/pthread/pt-internal.h @@ -26,15 +26,13 @@ #include <signal.h> #include <assert.h> -#include <atomic.h> +#include <bits/atomic.h> #include <pt-key.h> #include <pt-sysdep.h> #include <pt-machdep.h> -#include <sig-internal.h> - /* Thread state. */ enum pthread_state { @@ -52,10 +50,6 @@ enum pthread_state # define PTHREAD_SYSDEP_MEMBERS #endif -#ifndef PTHREAD_SIGNAL_MEMBERS -# define PTHREAD_SIGNAL_MEMBERS -#endif - /* This structure describes a POSIX thread. */ struct __pthread { @@ -91,8 +85,6 @@ struct __pthread PTHREAD_SYSDEP_MEMBERS - PTHREAD_SIGNAL_MEMBERS - struct __pthread *next, **prevp; }; @@ -140,7 +132,7 @@ __pthread_dequeue (struct __pthread *thread) ) /* The total number of threads currently active. */ -extern atomic_fast32_t __pthread_total; +extern __atomic_t __pthread_total; /* The total number of thread IDs currently in use, or on the list of available thread IDs. */ |