diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-21 22:07:49 +0000 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-21 22:07:49 +0000 |
commit | 51feb14bff6b4aa70e2f13a54e26a6b270de3e4d (patch) | |
tree | 239bdac248d9900665c6d3531c6c37c2eee9df02 | |
parent | db7bf9590dc08a72de9a9c46db7937188156fa2e (diff) |
Rename pthread functions to be used for forwarding
Libc will need to be able to call them, so they need to have a different
name.
* pthread/pt-exit.c (pthread_exit): Rename with __ prefix and add strong alias.
* pthread/pt-self.c (pthread_self): Likewise.
* pthread/pt-setcancelstate.c (pthread_setcancelstate): Likewise
* pthread/pt-setcanceltype.c (pthread_setcanceltype): Likewise
* sysdeps/generic/pt-attr-destroy.c (pthread_attr_destroy): Likewise
* sysdeps/generic/pt-attr-getdetachstate.c (pthread_attr_getdetachstate): Likewise
* sysdeps/generic/pt-attr-getinheritsched.c (pthread_attr_getinheritsched): Likewise
* sysdeps/generic/pt-attr-getschedparam.c (pthread_attr_getschedparam): Likewise
* sysdeps/generic/pt-attr-getschedpolicy.c (pthread_attr_getschedpolicy): Likewise
* sysdeps/generic/pt-attr-getscope.c (pthread_attr_getscope): Likewise
* sysdeps/generic/pt-attr-init.c (pthread_attr_init): Likewise
* sysdeps/generic/pt-attr-setdetachstate.c (pthread_attr_setdetachstate): Likewise
* sysdeps/generic/pt-attr-setinheritsched.c (pthread_attr_setinheritsched): Likewise
* sysdeps/generic/pt-attr-setschedparam.c (pthread_attr_setschedparam): Likewise
* sysdeps/generic/pt-attr-setschedpolicy.c (pthread_attr_setschedpolicy): Likewise
* sysdeps/generic/pt-attr-setscope.c (pthread_attr_setscope): Likewise
* sysdeps/generic/pt-cond-brdcast.c (pthread_cond_broadcast): Likewise
* sysdeps/generic/pt-cond-destroy.c (pthread_cond_destroy): Likewise
* sysdeps/generic/pt-cond-init.c (pthread_cond_init): Likewise
* sysdeps/generic/pt-cond-signal.c (pthread_cond_signal): Likewise
* sysdeps/generic/pt-cond-timedwait.c (pthread_cond_timedwait): Likewise
* sysdeps/generic/pt-cond-wait.c (pthread_cond_wait): Likewise
* sysdeps/generic/pt-condattr-destroy.c (pthread_condattr_destroy): Likewise
* sysdeps/generic/pt-condattr-init.c (pthread_condattr_init): Likewise
* sysdeps/generic/pt-equal.c (pthread_equal): Likewise
* sysdeps/generic/pt-getschedparam.c (pthread_getschedparam): Likewise
* sysdeps/generic/pt-setschedparam.c (pthread_setschedparam): Likewise
27 files changed, 79 insertions, 27 deletions
diff --git a/pthread/pt-exit.c b/pthread/pt-exit.c index c01efda..53a0427 100644 --- a/pthread/pt-exit.c +++ b/pthread/pt-exit.c @@ -30,7 +30,7 @@ /* Terminate the current thread and make STATUS available to any thread that might join it. */ void -pthread_exit (void *status) +__pthread_exit (void *status) { struct __pthread *self = _pthread_self (); struct __pthread_cancelation_handler **handlers; @@ -120,3 +120,5 @@ pthread_exit (void *status) /* NOTREACHED */ abort (); } + +strong_alias (__pthread_exit, pthread_exit); diff --git a/pthread/pt-self.c b/pthread/pt-self.c index 4976864..deb57c0 100644 --- a/pthread/pt-self.c +++ b/pthread/pt-self.c @@ -23,10 +23,12 @@ /* Return the thread ID of the calling thread. */ pthread_t -pthread_self (void) +__pthread_self (void) { struct __pthread *self = _pthread_self (); assert (self); return self->thread; } + +strong_alias (__pthread_self, pthread_self); diff --git a/pthread/pt-setcancelstate.c b/pthread/pt-setcancelstate.c index e2d8183..38550ee 100644 --- a/pthread/pt-setcancelstate.c +++ b/pthread/pt-setcancelstate.c @@ -22,7 +22,7 @@ #include <pt-internal.h> int -pthread_setcancelstate (int state, int *oldstate) +__pthread_setcancelstate (int state, int *oldstate) { struct __pthread *p = _pthread_self (); @@ -41,3 +41,5 @@ pthread_setcancelstate (int state, int *oldstate) return 0; } + +strong_alias (__pthread_setcancelstate, pthread_setcancelstate); diff --git a/pthread/pt-setcanceltype.c b/pthread/pt-setcanceltype.c index 3ce4259..7226a3a 100644 --- a/pthread/pt-setcanceltype.c +++ b/pthread/pt-setcanceltype.c @@ -22,7 +22,7 @@ #include <pt-internal.h> int -pthread_setcanceltype (int type, int *oldtype) +__pthread_setcanceltype (int type, int *oldtype) { struct __pthread *p = _pthread_self (); @@ -41,3 +41,5 @@ pthread_setcanceltype (int type, int *oldtype) return 0; } + +strong_alias (__pthread_setcanceltype, pthread_setcanceltype); diff --git a/sysdeps/generic/pt-attr-destroy.c b/sysdeps/generic/pt-attr-destroy.c index c4b9aa5..b9bd374 100644 --- a/sysdeps/generic/pt-attr-destroy.c +++ b/sysdeps/generic/pt-attr-destroy.c @@ -21,7 +21,8 @@ #include <pt-internal.h> int -pthread_attr_destroy (pthread_attr_t *attr) +__pthread_attr_destroy (pthread_attr_t *attr) { return 0; } +strong_alias (__pthread_attr_destroy, pthread_attr_destroy); diff --git a/sysdeps/generic/pt-attr-getdetachstate.c b/sysdeps/generic/pt-attr-getdetachstate.c index be406f1..b50f913 100644 --- a/sysdeps/generic/pt-attr-getdetachstate.c +++ b/sysdeps/generic/pt-attr-getdetachstate.c @@ -21,9 +21,11 @@ #include <pt-internal.h> int -pthread_attr_getdetachstate (const pthread_attr_t *attr, +__pthread_attr_getdetachstate (const pthread_attr_t *attr, int *detachstate) { *detachstate = attr->detachstate; return 0; } + +strong_alias (__pthread_attr_getdetachstate, pthread_attr_getdetachstate); diff --git a/sysdeps/generic/pt-attr-getinheritsched.c b/sysdeps/generic/pt-attr-getinheritsched.c index cca4e3d..7f1f601 100644 --- a/sysdeps/generic/pt-attr-getinheritsched.c +++ b/sysdeps/generic/pt-attr-getinheritsched.c @@ -21,9 +21,11 @@ #include <pt-internal.h> int -pthread_attr_getinheritsched (const pthread_attr_t *attr, +__pthread_attr_getinheritsched (const pthread_attr_t *attr, int *inheritsched) { *inheritsched = attr->inheritsched; return 0; } + +strong_alias (__pthread_attr_getinheritsched, pthread_attr_getinheritsched); diff --git a/sysdeps/generic/pt-attr-getschedparam.c b/sysdeps/generic/pt-attr-getschedparam.c index 190cf9d..4519b69 100644 --- a/sysdeps/generic/pt-attr-getschedparam.c +++ b/sysdeps/generic/pt-attr-getschedparam.c @@ -24,9 +24,11 @@ #include <pt-internal.h> int -pthread_attr_getschedparam (const pthread_attr_t *attr, +__pthread_attr_getschedparam (const pthread_attr_t *attr, struct sched_param *param) { memcpy (param, &attr->schedparam, sizeof *param); return 0; } + +strong_alias (__pthread_attr_getschedparam, pthread_attr_getschedparam); diff --git a/sysdeps/generic/pt-attr-getschedpolicy.c b/sysdeps/generic/pt-attr-getschedpolicy.c index 4349a23..0980bdd 100644 --- a/sysdeps/generic/pt-attr-getschedpolicy.c +++ b/sysdeps/generic/pt-attr-getschedpolicy.c @@ -21,9 +21,11 @@ #include <pt-internal.h> int -pthread_attr_getschedpolicy (const pthread_attr_t *attr, +__pthread_attr_getschedpolicy (const pthread_attr_t *attr, int *policy) { *policy = attr->schedpolicy; return 0; } + +strong_alias (__pthread_attr_getschedpolicy, pthread_attr_getschedpolicy); diff --git a/sysdeps/generic/pt-attr-getscope.c b/sysdeps/generic/pt-attr-getscope.c index 97198fa..46eb604 100644 --- a/sysdeps/generic/pt-attr-getscope.c +++ b/sysdeps/generic/pt-attr-getscope.c @@ -21,9 +21,11 @@ #include <pt-internal.h> int -pthread_attr_getscope (const pthread_attr_t *attr, +__pthread_attr_getscope (const pthread_attr_t *attr, int *contentionscope) { *contentionscope = attr->contentionscope; return 0; } + +strong_alias (__pthread_attr_getscope, pthread_attr_getscope); diff --git a/sysdeps/generic/pt-attr-init.c b/sysdeps/generic/pt-attr-init.c index 6a930e3..f9eb361 100644 --- a/sysdeps/generic/pt-attr-init.c +++ b/sysdeps/generic/pt-attr-init.c @@ -21,8 +21,9 @@ #include <pt-internal.h> int -pthread_attr_init (pthread_attr_t *attr) +__pthread_attr_init (pthread_attr_t *attr) { *attr = __pthread_default_attr; return 0; } +strong_alias (__pthread_attr_init, pthread_attr_init); diff --git a/sysdeps/generic/pt-attr-setdetachstate.c b/sysdeps/generic/pt-attr-setdetachstate.c index 688ba5d..abd6bbb 100644 --- a/sysdeps/generic/pt-attr-setdetachstate.c +++ b/sysdeps/generic/pt-attr-setdetachstate.c @@ -21,7 +21,7 @@ #include <pt-internal.h> int -pthread_attr_setdetachstate (pthread_attr_t *attr, +__pthread_attr_setdetachstate (pthread_attr_t *attr, int detachstate) { switch (detachstate) @@ -36,3 +36,5 @@ pthread_attr_setdetachstate (pthread_attr_t *attr, return 0; } + +strong_alias (__pthread_attr_setdetachstate, pthread_attr_setdetachstate); diff --git a/sysdeps/generic/pt-attr-setinheritsched.c b/sysdeps/generic/pt-attr-setinheritsched.c index e9012c5..9fdbd4e 100644 --- a/sysdeps/generic/pt-attr-setinheritsched.c +++ b/sysdeps/generic/pt-attr-setinheritsched.c @@ -21,7 +21,7 @@ #include <pt-internal.h> int -pthread_attr_setinheritsched (pthread_attr_t *attr, +__pthread_attr_setinheritsched (pthread_attr_t *attr, int inheritsched) { switch (inheritsched) @@ -36,3 +36,5 @@ pthread_attr_setinheritsched (pthread_attr_t *attr, return 0; } + +strong_alias (__pthread_attr_setinheritsched, pthread_attr_setinheritsched); diff --git a/sysdeps/generic/pt-attr-setschedparam.c b/sysdeps/generic/pt-attr-setschedparam.c index 5459f10..2fd1d3a 100644 --- a/sysdeps/generic/pt-attr-setschedparam.c +++ b/sysdeps/generic/pt-attr-setschedparam.c @@ -24,7 +24,7 @@ #include <pt-internal.h> int -pthread_attr_setschedparam (pthread_attr_t *attr, +__pthread_attr_setschedparam (pthread_attr_t *attr, const struct sched_param *param) { if (memcmp (param, &__pthread_default_attr.schedparam, @@ -36,3 +36,5 @@ pthread_attr_setschedparam (pthread_attr_t *attr, return ENOTSUP; } + +strong_alias (__pthread_attr_setschedparam, pthread_attr_setschedparam); diff --git a/sysdeps/generic/pt-attr-setschedpolicy.c b/sysdeps/generic/pt-attr-setschedpolicy.c index e481d04..04e93c9 100644 --- a/sysdeps/generic/pt-attr-setschedpolicy.c +++ b/sysdeps/generic/pt-attr-setschedpolicy.c @@ -21,7 +21,7 @@ #include <pt-internal.h> int -pthread_attr_setschedpolicy (pthread_attr_t *attr, +__pthread_attr_setschedpolicy (pthread_attr_t *attr, int policy) { switch (policy) @@ -40,3 +40,5 @@ pthread_attr_setschedpolicy (pthread_attr_t *attr, return 0; } + +strong_alias (__pthread_attr_setschedpolicy, pthread_attr_setschedpolicy); diff --git a/sysdeps/generic/pt-attr-setscope.c b/sysdeps/generic/pt-attr-setscope.c index c74a4f6..d86d7b5 100644 --- a/sysdeps/generic/pt-attr-setscope.c +++ b/sysdeps/generic/pt-attr-setscope.c @@ -21,7 +21,7 @@ #include <pt-internal.h> int -pthread_attr_setscope (pthread_attr_t *attr, +__pthread_attr_setscope (pthread_attr_t *attr, int contentionscope) { if (contentionscope == __pthread_default_attr.contentionscope) @@ -39,3 +39,5 @@ pthread_attr_setscope (pthread_attr_t *attr, return EINVAL; } } + +strong_alias (__pthread_attr_setscope, pthread_attr_setscope); diff --git a/sysdeps/generic/pt-cond-brdcast.c b/sysdeps/generic/pt-cond-brdcast.c index 3f55e33..999cc2d 100644 --- a/sysdeps/generic/pt-cond-brdcast.c +++ b/sysdeps/generic/pt-cond-brdcast.c @@ -23,7 +23,7 @@ /* Unblock all threads that are blocked on condition variable COND. */ int -pthread_cond_broadcast (pthread_cond_t *cond) +__pthread_cond_broadcast (pthread_cond_t *cond) { struct __pthread *wakeup; @@ -40,3 +40,5 @@ pthread_cond_broadcast (pthread_cond_t *cond) return 0; } + +strong_alias (__pthread_cond_broadcast, pthread_cond_broadcast); diff --git a/sysdeps/generic/pt-cond-destroy.c b/sysdeps/generic/pt-cond-destroy.c index eba4778..d72ea75 100644 --- a/sysdeps/generic/pt-cond-destroy.c +++ b/sysdeps/generic/pt-cond-destroy.c @@ -21,7 +21,9 @@ #include <pt-internal.h> int -pthread_cond_destroy (pthread_cond_t *cond) +__pthread_cond_destroy (pthread_cond_t *cond) { return 0; } + +strong_alias (__pthread_cond_destroy, pthread_cond_destroy); diff --git a/sysdeps/generic/pt-cond-init.c b/sysdeps/generic/pt-cond-init.c index b9e9fb7..350f2eb 100644 --- a/sysdeps/generic/pt-cond-init.c +++ b/sysdeps/generic/pt-cond-init.c @@ -24,7 +24,7 @@ #include <pt-internal.h> int -pthread_cond_init (pthread_cond_t *cond, +__pthread_cond_init (pthread_cond_t *cond, const pthread_condattr_t *attr) { *cond = (pthread_cond_t) __PTHREAD_COND_INITIALIZER; @@ -43,3 +43,5 @@ pthread_cond_init (pthread_cond_t *cond, *cond->__attr = *attr; return 0; } + +strong_alias (__pthread_cond_init, pthread_cond_init); diff --git a/sysdeps/generic/pt-cond-signal.c b/sysdeps/generic/pt-cond-signal.c index c5e1bc1..d7c91e6 100644 --- a/sysdeps/generic/pt-cond-signal.c +++ b/sysdeps/generic/pt-cond-signal.c @@ -46,9 +46,11 @@ cond_signal (struct __pthread_cond *cond, int *unblocked) /* Unblock at least one of the threads that are blocked on condition variable COND. */ int -pthread_cond_signal (pthread_cond_t *cond) +__pthread_cond_signal (pthread_cond_t *cond) { int unblocked = 0; return cond_signal (cond, &unblocked); } + +strong_alias (__pthread_cond_signal, pthread_cond_signal); diff --git a/sysdeps/generic/pt-cond-timedwait.c b/sysdeps/generic/pt-cond-timedwait.c index c10bdb3..483f277 100644 --- a/sysdeps/generic/pt-cond-timedwait.c +++ b/sysdeps/generic/pt-cond-timedwait.c @@ -26,13 +26,15 @@ extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond, const struct timespec *abstime); int -pthread_cond_timedwait (pthread_cond_t *cond, +__pthread_cond_timedwait (pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime) { return __pthread_cond_timedwait_internal (cond, mutex, abstime); } +strong_alias (__pthread_cond_timedwait, pthread_cond_timedwait); + /* Block on condition variable COND until ABSTIME. As a GNU extension, if ABSTIME is NULL, then wait forever. MUTEX should be held by the calling thread. On return, MUTEX will be held by the diff --git a/sysdeps/generic/pt-cond-wait.c b/sysdeps/generic/pt-cond-wait.c index a03476d..38a2ae6 100644 --- a/sysdeps/generic/pt-cond-wait.c +++ b/sysdeps/generic/pt-cond-wait.c @@ -31,7 +31,9 @@ extern int __pthread_cond_timedwait_internal (pthread_cond_t *cond, calling thread. On return, MUTEX will be held by the calling thread. */ int -pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex) +__pthread_cond_wait (pthread_cond_t *cond, pthread_mutex_t *mutex) { return __pthread_cond_timedwait_internal (cond, mutex, 0); } + +strong_alias (__pthread_cond_wait, pthread_cond_wait); diff --git a/sysdeps/generic/pt-condattr-destroy.c b/sysdeps/generic/pt-condattr-destroy.c index c8fd71b..9fd55b1 100644 --- a/sysdeps/generic/pt-condattr-destroy.c +++ b/sysdeps/generic/pt-condattr-destroy.c @@ -21,7 +21,9 @@ #include <pt-internal.h> int -pthread_condattr_destroy (pthread_condattr_t *cond) +__pthread_condattr_destroy (pthread_condattr_t *cond) { return 0; } + +strong_alias (__pthread_condattr_destroy, pthread_condattr_destroy); diff --git a/sysdeps/generic/pt-condattr-init.c b/sysdeps/generic/pt-condattr-init.c index cf9e198..8570fd1 100644 --- a/sysdeps/generic/pt-condattr-init.c +++ b/sysdeps/generic/pt-condattr-init.c @@ -21,8 +21,10 @@ #include <pt-internal.h> int -pthread_condattr_init (pthread_condattr_t *attr) +__pthread_condattr_init (pthread_condattr_t *attr) { *attr = __pthread_default_condattr; return 0; } + +strong_alias (__pthread_condattr_init, pthread_condattr_init); diff --git a/sysdeps/generic/pt-equal.c b/sysdeps/generic/pt-equal.c index 8fbc519..72fc7e6 100644 --- a/sysdeps/generic/pt-equal.c +++ b/sysdeps/generic/pt-equal.c @@ -23,7 +23,9 @@ /* Return true if __T1 and __T2 both name the same thread. Otherwise, false. */ int -pthread_equal (pthread_t __t1, pthread_t __t2) +__pthread_equal (pthread_t __t1, pthread_t __t2) { return __t1 == __t2; } + +strong_alias (__pthread_equal, pthread_equal); diff --git a/sysdeps/generic/pt-getschedparam.c b/sysdeps/generic/pt-getschedparam.c index c128d02..6ec45fe 100644 --- a/sysdeps/generic/pt-getschedparam.c +++ b/sysdeps/generic/pt-getschedparam.c @@ -21,8 +21,10 @@ #include <pt-internal.h> int -pthread_getschedparam (pthread_t thread, int *policy, +__pthread_getschedparam (pthread_t thread, int *policy, struct sched_param *param) { return ENOSYS; } + +strong_alias (__pthread_getschedparam, pthread_getschedparam); diff --git a/sysdeps/generic/pt-setschedparam.c b/sysdeps/generic/pt-setschedparam.c index a70b079..14aeb0c 100644 --- a/sysdeps/generic/pt-setschedparam.c +++ b/sysdeps/generic/pt-setschedparam.c @@ -21,8 +21,10 @@ #include <pt-internal.h> int -pthread_setschedparam (pthread_t thread, int policy, +__pthread_setschedparam (pthread_t thread, int policy, const struct sched_param *param) { return ENOSYS; } + +strong_alias (__pthread_setschedparam, pthread_setschedparam); |