diff options
Diffstat (limited to 'sysdeps/htl')
-rw-r--r-- | sysdeps/htl/pt-attr-getstack.c | 5 | ||||
-rw-r--r-- | sysdeps/htl/pt-attr-getstackaddr.c | 3 | ||||
-rw-r--r-- | sysdeps/htl/pt-attr-getstacksize.c | 3 | ||||
-rw-r--r-- | sysdeps/htl/pt-attr-setstack.c | 12 | ||||
-rw-r--r-- | sysdeps/htl/pt-attr-setstackaddr.c | 3 | ||||
-rw-r--r-- | sysdeps/htl/pt-attr-setstacksize.c | 4 | ||||
-rw-r--r-- | sysdeps/htl/pt-cond-timedwait.c | 5 | ||||
-rw-r--r-- | sysdeps/htl/pt-key-create.c | 2 | ||||
-rw-r--r-- | sysdeps/htl/pt-key.h | 1 | ||||
-rw-r--r-- | sysdeps/htl/pthreadP.h | 28 |
10 files changed, 52 insertions, 14 deletions
diff --git a/sysdeps/htl/pt-attr-getstack.c b/sysdeps/htl/pt-attr-getstack.c index db04665bfc..6d8b286889 100644 --- a/sysdeps/htl/pt-attr-getstack.c +++ b/sysdeps/htl/pt-attr-getstack.c @@ -18,13 +18,14 @@ #include <pthread.h> #include <pt-internal.h> +#include <pthreadP.h> int __pthread_attr_getstack (const pthread_attr_t *attr, void **stackaddr, size_t * stacksize) { - pthread_attr_getstackaddr (attr, stackaddr); - pthread_attr_getstacksize (attr, stacksize); + __pthread_attr_getstackaddr (attr, stackaddr); + __pthread_attr_getstacksize (attr, stacksize); return 0; } weak_alias (__pthread_attr_getstack, pthread_attr_getstack) diff --git a/sysdeps/htl/pt-attr-getstackaddr.c b/sysdeps/htl/pt-attr-getstackaddr.c index 63661c26dc..6f2507a0c1 100644 --- a/sysdeps/htl/pt-attr-getstackaddr.c +++ b/sysdeps/htl/pt-attr-getstackaddr.c @@ -20,8 +20,9 @@ #include <pt-internal.h> int -pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr) +__pthread_attr_getstackaddr (const pthread_attr_t *attr, void **stackaddr) { *stackaddr = attr->__stackaddr; return 0; } +strong_alias (__pthread_attr_getstackaddr, pthread_attr_getstackaddr) diff --git a/sysdeps/htl/pt-attr-getstacksize.c b/sysdeps/htl/pt-attr-getstacksize.c index f3f33b47c6..824d363538 100644 --- a/sysdeps/htl/pt-attr-getstacksize.c +++ b/sysdeps/htl/pt-attr-getstacksize.c @@ -20,8 +20,9 @@ #include <pt-internal.h> int -pthread_attr_getstacksize (const pthread_attr_t *attr, size_t * stacksize) +__pthread_attr_getstacksize (const pthread_attr_t *attr, size_t * stacksize) { *stacksize = attr->__stacksize; return 0; } +strong_alias (__pthread_attr_getstacksize, pthread_attr_getstacksize) diff --git a/sysdeps/htl/pt-attr-setstack.c b/sysdeps/htl/pt-attr-setstack.c index 70d6d0909f..f18025b264 100644 --- a/sysdeps/htl/pt-attr-setstack.c +++ b/sysdeps/htl/pt-attr-setstack.c @@ -20,25 +20,26 @@ #include <assert.h> #include <pt-internal.h> +#include <pthreadP.h> int -pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr, size_t stacksize) +__pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr, size_t stacksize) { int err; size_t s; /* pthread_attr_setstack should always succeed, thus we set the size first as it is more discriminating. */ - pthread_attr_getstacksize (attr, &s); + __pthread_attr_getstacksize (attr, &s); - err = pthread_attr_setstacksize (attr, stacksize); + err = __pthread_attr_setstacksize (attr, stacksize); if (err) return err; - err = pthread_attr_setstackaddr (attr, stackaddr); + err = __pthread_attr_setstackaddr (attr, stackaddr); if (err) { - int e = pthread_attr_setstacksize (attr, s); + int e = __pthread_attr_setstacksize (attr, s); assert_perror (e); return err; @@ -46,3 +47,4 @@ pthread_attr_setstack (pthread_attr_t *attr, void *stackaddr, size_t stacksize) return 0; } +strong_alias (__pthread_attr_setstack, pthread_attr_setstack) diff --git a/sysdeps/htl/pt-attr-setstackaddr.c b/sysdeps/htl/pt-attr-setstackaddr.c index d15f5d74e0..491005bcc1 100644 --- a/sysdeps/htl/pt-attr-setstackaddr.c +++ b/sysdeps/htl/pt-attr-setstackaddr.c @@ -20,8 +20,9 @@ #include <pt-internal.h> int -pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr) +__pthread_attr_setstackaddr (pthread_attr_t *attr, void *stackaddr) { attr->__stackaddr = stackaddr; return 0; } +strong_alias (__pthread_attr_setstackaddr, pthread_attr_setstackaddr) diff --git a/sysdeps/htl/pt-attr-setstacksize.c b/sysdeps/htl/pt-attr-setstacksize.c index aa3e8000fa..38bec3f7c7 100644 --- a/sysdeps/htl/pt-attr-setstacksize.c +++ b/sysdeps/htl/pt-attr-setstacksize.c @@ -20,9 +20,9 @@ #include <pt-internal.h> int -pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize) +__pthread_attr_setstacksize (pthread_attr_t *attr, size_t stacksize) { attr->__stacksize = stacksize; - return 0; } +strong_alias (__pthread_attr_setstacksize, pthread_attr_setstacksize) diff --git a/sysdeps/htl/pt-cond-timedwait.c b/sysdeps/htl/pt-cond-timedwait.c index 7784a4a271..66051af417 100644 --- a/sysdeps/htl/pt-cond-timedwait.c +++ b/sysdeps/htl/pt-cond-timedwait.c @@ -19,6 +19,7 @@ #include <pthread.h> #include <pt-internal.h> +#include <pthreadP.h> extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond, pthread_mutex_t *mutex, @@ -115,7 +116,7 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond, __pthread_mutex_unlock (&self->cancel_lock); if (cancelled) - pthread_exit (PTHREAD_CANCELED); + __pthread_exit (PTHREAD_CANCELED); /* Release MUTEX before blocking. */ __pthread_mutex_unlock (mutex); @@ -171,7 +172,7 @@ __pthread_cond_timedwait_internal (pthread_cond_t *cond, __pthread_mutex_lock (mutex); if (cancelled) - pthread_exit (PTHREAD_CANCELED); + __pthread_exit (PTHREAD_CANCELED); return err; } diff --git a/sysdeps/htl/pt-key-create.c b/sysdeps/htl/pt-key-create.c index 430dd2315e..a295bc78d9 100644 --- a/sysdeps/htl/pt-key-create.c +++ b/sysdeps/htl/pt-key-create.c @@ -21,6 +21,7 @@ #include <assert.h> #include <pt-internal.h> +#include <pthreadP.h> pthread_mutex_t __pthread_key_lock; @@ -106,3 +107,4 @@ do_search: return 0; } strong_alias (__pthread_key_create, pthread_key_create) +hidden_def (__pthread_key_create) diff --git a/sysdeps/htl/pt-key.h b/sysdeps/htl/pt-key.h index 09aa35c357..893adccd2e 100644 --- a/sysdeps/htl/pt-key.h +++ b/sysdeps/htl/pt-key.h @@ -18,6 +18,7 @@ #include <pthread.h> #include <libc-lockP.h> +#include <pthreadP.h> #define PTHREAD_KEY_MEMBERS \ void **thread_specifics; /* This is only resized by the thread, and always growing */ \ diff --git a/sysdeps/htl/pthreadP.h b/sysdeps/htl/pthreadP.h index c37974945a..6c9aa6cb75 100644 --- a/sysdeps/htl/pthreadP.h +++ b/sysdeps/htl/pthreadP.h @@ -27,20 +27,48 @@ extern pthread_t __pthread_self (void); extern int __pthread_kill (pthread_t threadid, int signo); extern struct __pthread **__pthread_threads; +extern int _pthread_mutex_init (pthread_mutex_t *mutex, const pthread_mutexattr_t *attr); extern int __pthread_mutex_lock (pthread_mutex_t *__mutex); extern int __pthread_mutex_unlock (pthread_mutex_t *__mutex); +extern int __pthread_cond_broadcast (pthread_cond_t *cond); + typedef struct __cthread *__cthread_t; typedef int __cthread_key_t; typedef void * (*__cthread_fn_t)(void *__arg); __cthread_t __cthread_fork (__cthread_fn_t, void *); +int __pthread_create (pthread_t *newthread, + const pthread_attr_t *attr, + void *(*start_routine) (void *), void *arg); + void __cthread_detach (__cthread_t); +int __pthread_detach (pthread_t __threadp); +void __pthread_exit (void *value) __attribute__ ((__noreturn__)); int __cthread_keycreate (__cthread_key_t *); int __cthread_getspecific (__cthread_key_t, void **); int __cthread_setspecific (__cthread_key_t, void *); +int __pthread_key_create (pthread_key_t *key, void (*destr) (void *)); +void *__pthread_getspecific (pthread_key_t key); +int __pthread_setspecific (pthread_key_t key, const void *value); + +int __pthread_setcancelstate (int state, int *oldstate); int __pthread_getattr_np (pthread_t, pthread_attr_t *); +int __pthread_attr_getstackaddr (const pthread_attr_t *__restrict __attr, + void **__restrict __stackaddr); +int __pthread_attr_setstackaddr (pthread_attr_t *__attr, void *__stackaddr); +int __pthread_attr_getstacksize (const pthread_attr_t *__restrict __attr, + size_t *__restrict __stacksize); +int __pthread_attr_setstacksize (pthread_attr_t *__attr, size_t __stacksize); +int __pthread_attr_setstack (pthread_attr_t *__attr, void *__stackaddr, + size_t __stacksize); int __pthread_attr_getstack (const pthread_attr_t *, void **, size_t *); +struct __pthread_cancelation_handler **___pthread_get_cleanup_stack (void); + +#if IS_IN (libpthread) +hidden_proto (__pthread_key_create) +hidden_proto (_pthread_mutex_init) +#endif #endif /* pthreadP.h */ |