htl: Rename _pthread_mutex_init/destroy to __pthread_mutex_init/destroy

This commit is contained in:
Samuel Thibault 2020-01-13 19:46:25 +00:00
parent 0093df204a
commit e775f443bd
6 changed files with 13 additions and 11 deletions

View File

@ -149,9 +149,10 @@ libpthread {
__pthread_setspecific;
__pthread_getattr_np;
__pthread_attr_getstack;
__pthread_mutex_init;
__pthread_mutex_destroy;
__pthread_mutex_timedlock;
_pthread_mutex_destroy; _pthread_mutex_init;
_pthread_mutex_lock; _pthread_mutex_trylock; _pthread_mutex_unlock;
_pthread_rwlock_destroy; _pthread_rwlock_init;
}

View File

@ -51,8 +51,8 @@ static const struct pthread_functions pthread_functions = {
.ptr___pthread_exit = __pthread_exit,
.ptr_pthread_getschedparam = __pthread_getschedparam,
.ptr_pthread_setschedparam = __pthread_setschedparam,
.ptr_pthread_mutex_destroy = _pthread_mutex_destroy,
.ptr_pthread_mutex_init = _pthread_mutex_init,
.ptr_pthread_mutex_destroy = __pthread_mutex_destroy,
.ptr_pthread_mutex_init = __pthread_mutex_init,
.ptr_pthread_mutex_lock = __pthread_mutex_lock,
.ptr_pthread_mutex_trylock = __pthread_mutex_trylock,
.ptr_pthread_mutex_unlock = __pthread_mutex_unlock,

View File

@ -66,7 +66,7 @@ __pthread_key_lock_ready (void)
err = __pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
assert_perror (err);
err = _pthread_mutex_init (&__pthread_key_lock, &attr);
err = __pthread_mutex_init (&__pthread_key_lock, &attr);
assert_perror (err);
err = __pthread_mutexattr_destroy (&attr);

View File

@ -27,7 +27,8 @@ 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_init (pthread_mutex_t *__mutex, const pthread_mutexattr_t *__attr);
extern int __pthread_mutex_destroy (pthread_mutex_t *__mutex);
extern int __pthread_mutex_lock (pthread_mutex_t *__mutex);
extern int __pthread_mutex_timedlock (pthread_mutex_t *__mutex,
const struct timespec *__abstime);
@ -73,7 +74,7 @@ struct __pthread_cancelation_handler **___pthread_get_cleanup_stack (void) attri
hidden_proto (__pthread_key_create)
hidden_proto (__pthread_getspecific)
hidden_proto (__pthread_setspecific)
hidden_proto (_pthread_mutex_init)
hidden_proto (__pthread_mutex_init)
#endif
#define ASSERT_TYPE_SIZE(type, size) \

View File

@ -24,7 +24,7 @@
#include <hurdlock.h>
int
_pthread_mutex_destroy (pthread_mutex_t *mtxp)
__pthread_mutex_destroy (pthread_mutex_t *mtxp)
{
atomic_read_barrier ();
if (*(volatile unsigned int *) &mtxp->__lock != 0)
@ -34,4 +34,4 @@ _pthread_mutex_destroy (pthread_mutex_t *mtxp)
return 0;
}
strong_alias (_pthread_mutex_destroy, pthread_mutex_destroy)
strong_alias (__pthread_mutex_destroy, pthread_mutex_destroy)

View File

@ -32,7 +32,7 @@ static const pthread_mutexattr_t dfl_attr = {
};
int
_pthread_mutex_init (pthread_mutex_t *mtxp, const pthread_mutexattr_t *attrp)
__pthread_mutex_init (pthread_mutex_t *mtxp, const pthread_mutexattr_t *attrp)
{
ASSERT_TYPE_SIZE (pthread_mutex_t, __SIZEOF_PTHREAD_MUTEX_T);
@ -55,5 +55,5 @@ _pthread_mutex_init (pthread_mutex_t *mtxp, const pthread_mutexattr_t *attrp)
return 0;
}
strong_alias (_pthread_mutex_init, pthread_mutex_init)
hidden_def (_pthread_mutex_init)
strong_alias (__pthread_mutex_init, pthread_mutex_init)
hidden_def (__pthread_mutex_init)