summaryrefslogtreecommitdiff
path: root/pthread/pt-internal.h
diff options
context:
space:
mode:
authorNeal H. Walfield <neal@gnu.org>2008-08-12 15:07:50 +0000
committerThomas Schwinge <tschwinge@gnu.org>2009-04-07 23:52:49 +0200
commit61585a1da2ce36b0db1cbc9673456205d5111e78 (patch)
tree3539b1cc2c6f95c6fc453c14fdc0c8c6468c2376 /pthread/pt-internal.h
parent38648cd5741e671ef977879150be16546b71d84b (diff)
2008-08-12 Neal H. Walfield <neal@gnu.org>
Merge changes from hurd-l4 fork. * Makefile (SRCS): Add pt-startup.c and pt-mutex-transfer-np.c. (sysdeps_headers): Add pthread-np.h. 2008-08-12 Neal H. Walfield <neal@gnu.org> * sysdeps/generic/bits/pthread-np.h: New file. 2008-08-12 Neal H. Walfield <neal@gnu.org> * sysdeps/generic/pt-startup.c: New file. 2008-08-12 Neal H. Walfield <neal@gnu.org> * sysdeps/generic/bits/mutex.h (__PTHREAD_RECURSIVE_MUTEX_INITIALIZER): Define. (__PTHREAD_MUTEX_RECURSIVE_INITIALIZER): Don't define. * include/pthread/pthread.h (PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP) [__USE_GNU]: Define. (PTHREAD_MUTEX_RECURSIVE_INITIALIZER_NP): Don't define. 2008-08-12 Neal H. Walfield <neal@gnu.org> * include/pthread/pthread.h: Include <sys/cdefs.h>. (__extern_inline): If not defined, define appropriately. 2008-06-01 Neal H. Walfield <neal@gnu.org> * include/pthread/pthread.h (PTHREAD_MUTEX_RECURSIVE_INITIALIZER_NP): New definition. * sysdeps/generic/bits/mutex.h (__PTHREAD_MUTEX_RECURSIVE_INITIALIZER): New definition. * sysdeps/generic/bits/mutex-attr.h (__pthread_recursive_mutexattr): New definition. * sysdeps/generic/pt-mutexattr.c (__pthread_recursive_mutexattr): New declaration. * sysdeps/generic/pt-mutex-init.c (_pthread_mutex_init): If ATTR is &__PTHREAD_RECURSIVE_MUTEXATTR, don't allocate a copy, just save in MUTEX->ATTR. * sysdeps/generic/pt-mutex-destroy.c (_pthread_mutex_destroy): If MUTEX->ATTR is &__PTHREAD_RECURSIVE_MUTEXATTR, don't free it. 2008-05-29 Thomas Schwinge <tschwinge@gnu.org> * sysdeps/generic/sem-timedwait.c: Don't include <error.h>. 2008-05-21 Neal H. Walfield <neal@gnu.org> * include/pthread/pthread.h: Include <bits/pthread-np.h>. 2008-03-01 Neal H. Walfield <neal@gnu.org> * sysdeps/generic/pt-mutex-transfer-np.c: New file. * pthread/pt-self.c (pthread_self): Assert that SELF is not NULL. 2007-12-23 Neal H. Walfield <neal@gnu.org> * pthread/pt-join.c (pthread_join): Cast argument to pthread_cleanup_push to avoid warning. 2007-11-23 Neal H. Walfield <neal@gnu.org> * pthread/pt-internal.h (__pthread_startup): Add declaration. * pthread/pt-create.c (entry_point): Call __pthread_startup.
Diffstat (limited to 'pthread/pt-internal.h')
-rw-r--r--pthread/pt-internal.h12
1 files changed, 2 insertions, 10 deletions
diff --git a/pthread/pt-internal.h b/pthread/pt-internal.h
index 9eb84ed..0fd7920 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. */