* pthread.cc (pthread_attr_init): Remove
(pthread_attr_destroy): Ditto. (pthread_attr_setdetachstate): Ditto. (pthread_attr_getdetachstate): Ditto. (pthread_attr_setstacksize): Ditto. (pthread_attr_getstacksize): Ditto. (pthread_attr_setinheritsched): Ditto. (pthread_attr_getinheritsched): Ditto. (pthread_attr_setschedparam): Ditto. (pthread_attr_getschedparam): Ditto. (pthread_attr_setschedpolicy): Ditto. (pthread_attr_getschedpolicy): Ditto. (pthread_attr_setscope): Ditto. (pthread_attr_getscope): Ditto. (pthread_attr_setstackaddr): Ditto. (pthread_attr_getstackaddr): Ditto. (pthread_key_create): Ditto. (pthread_key_delete): Ditto. (pthread_setspecific): Ditto. (pthread_getspecific): Ditto. (pthread_kill): Ditto. (pthread_sigmask): Ditto. (pthread_equal): Ditto. (pthread_mutex_lock): Ditto. (pthread_mutex_trylock): Ditto. (pthread_mutex_unlock): Ditto. (pthread_mutex_destroy): Ditto. (pthread_mutex_setprioceiling): Ditto. (pthread_mutex_getprioceiling): Ditto. (pthread_mutexattr_destroy): Ditto. (pthread_mutexattr_getprioceiling): Ditto. (pthread_mutexattr_getprotocol): Ditto. (pthread_mutexattr_getpshared): Ditto. (pthread_mutexattr_gettype): Ditto. (pthread_mutexattr_init): Ditto. (pthread_mutexattr_setprioceiling): Ditto. (pthread_mutexattr_setprotocol): Ditto. (pthread_mutexattr_setpshared): Ditto. (pthread_mutexattr_settype): Ditto. (pthread_cond_destroy): Ditto. (pthread_cond_signal): Ditto. (pthread_cond_broadcast): Ditto. (pthread_condattr_init): Ditto. (pthread_condattr_destroy): Ditto. (pthread_condattr_getpshared): Ditto. (pthread_condattr_setpshared): Ditto. (pthread_rwlock_destroy): Ditto. (pthread_rwlock_rdlock): Ditto. (pthread_rwlock_tryrdlock): Ditto. (pthread_rwlock_wrlock): Ditto. (pthread_rwlock_trywrlock): Ditto. (pthread_rwlock_unlock): Ditto. (pthread_rwlockattr_init): Ditto. (pthread_rwlockattr_getpshared): Ditto. (pthread_rwlockattr_setpshared): Ditto. (pthread_rwlockattr_destroy): Ditto. (pthread_getconcurrency): Ditto. (pthread_setconcurrency): Ditto. (pthread_getschedparam): Ditto. (pthread_setschedparam): Ditto. * thread.h (__pthread_attr_init): Remove prototype. (__pthread_attr_destroy): Ditto. (__pthread_attr_setdetachstate): Ditto. (__pthread_attr_getdetachstate): Ditto. (__pthread_attr_setstacksize): Ditto. (__pthread_attr_getstacksize): Ditto. (__pthread_attr_setinheritsched): Ditto. (__pthread_attr_getinheritsched): Ditto. (__pthread_attr_setschedparam): Ditto. (__pthread_attr_getschedparam): Ditto. (__pthread_attr_setschedpolicy): Ditto. (__pthread_attr_getschedpolicy): Ditto. (__pthread_attr_setscope): Ditto. (__pthread_attr_getscope): Ditto. (__pthread_attr_setstackaddr): Ditto. (__pthread_attr_getstackaddr): Ditto. (__pthread_key_create): Ditto. (__pthread_key_delete): Ditto. (__pthread_setspecific): Ditto. (__pthread_getspecific): Ditto. (__pthread_kill): Ditto. (__pthread_sigmask): Ditto. (__pthread_equal): Ditto. (__pthread_mutex_lock): Ditto. (__pthread_mutex_trylock): Ditto. (__pthread_mutex_unlock): Ditto. (__pthread_mutex_destroy): Ditto. (__pthread_mutex_setprioceiling): Ditto. (__pthread_mutex_getprioceiling): Ditto. (__pthread_mutexattr_destroy): Ditto. (__pthread_mutexattr_getprioceiling): Ditto. (__pthread_mutexattr_getprotocol): Ditto. (__pthread_mutexattr_getpshared): Ditto. (__pthread_mutexattr_gettype): Ditto. (__pthread_mutexattr_init): Ditto. (__pthread_mutexattr_setprioceiling): Ditto. (__pthread_mutexattr_setprotocol): Ditto. (__pthread_mutexattr_setpshared): Ditto. (__pthread_mutexattr_settype): Ditto. (__pthread_cond_destroy): Ditto. (__pthread_cond_signal): Ditto. (__pthread_cond_broadcast): Ditto. (__pthread_condattr_init): Ditto. (__pthread_condattr_destroy): Ditto. (__pthread_condattr_getpshared): Ditto. (__pthread_condattr_setpshared): Ditto. (__pthread_rwlock_destroy): Ditto. (__pthread_rwlock_rdlock): Ditto. (__pthread_rwlock_tryrdlock): Ditto. (__pthread_rwlock_wrlock): Ditto. (__pthread_rwlock_trywrlock): Ditto. (__pthread_rwlock_unlock): Ditto. (__pthread_rwlockattr_init): Ditto. (__pthread_rwlockattr_getpshared): Ditto. (__pthread_rwlockattr_setpshared): Ditto. (__pthread_rwlockattr_destroy): Ditto. (__pthread_getconcurrency): Ditto. (__pthread_setconcurrency): Ditto. (__pthread_getschedparam): Ditto. (__pthread_setschedparam): Ditto. * thread.cc: Rename __pthread_equal to pthread_equal throughout. Change pthread_self parameter appropriate. (__pthread_attr_init): Remove __ prefix. Change to extern "C". (__pthread_attr_destroy): Ditto. (__pthread_attr_setdetachstate): Ditto. (__pthread_attr_getdetachstate): Ditto. (__pthread_attr_setstacksize): Ditto. (__pthread_attr_getstacksize): Ditto. (__pthread_attr_setinheritsched): Ditto. (__pthread_attr_getinheritsched): Ditto. (__pthread_attr_setschedparam): Ditto. (__pthread_attr_getschedparam): Ditto. (__pthread_attr_setschedpolicy): Ditto. (__pthread_attr_getschedpolicy): Ditto. (__pthread_attr_setscope): Ditto. (__pthread_attr_getscope): Ditto. (__pthread_attr_setstackaddr): Ditto. (__pthread_attr_getstackaddr): Ditto. (__pthread_key_create): Ditto. (__pthread_key_delete): Ditto. (__pthread_setspecific): Ditto. (__pthread_getspecific): Ditto. (__pthread_kill): Ditto. (__pthread_sigmask): Ditto. (__pthread_equal): Ditto. (__pthread_mutex_lock): Ditto. (__pthread_mutex_trylock): Ditto. (__pthread_mutex_unlock): Ditto. (__pthread_mutex_destroy): Ditto. (__pthread_mutex_setprioceiling): Ditto. (__pthread_mutex_getprioceiling): Ditto. (__pthread_mutexattr_destroy): Ditto. (__pthread_mutexattr_getprioceiling): Ditto. (__pthread_mutexattr_getprotocol): Ditto. (__pthread_mutexattr_getpshared): Ditto. (__pthread_mutexattr_gettype): Ditto. (__pthread_mutexattr_init): Ditto. (__pthread_mutexattr_setprioceiling): Ditto. (__pthread_mutexattr_setprotocol): Ditto. (__pthread_mutexattr_setpshared): Ditto. (__pthread_mutexattr_settype): Ditto. (__pthread_cond_destroy): Ditto. (__pthread_cond_signal): Ditto. (__pthread_cond_broadcast): Ditto. (__pthread_condattr_init): Ditto. (__pthread_condattr_destroy): Ditto. (__pthread_condattr_getpshared): Ditto. (__pthread_condattr_setpshared): Ditto. (__pthread_rwlock_destroy): Ditto. (__pthread_rwlock_rdlock): Ditto. (__pthread_rwlock_tryrdlock): Ditto. (__pthread_rwlock_wrlock): Ditto. (__pthread_rwlock_trywrlock): Ditto. (__pthread_rwlock_unlock): Ditto. (__pthread_rwlockattr_init): Ditto. (__pthread_rwlockattr_getpshared): Ditto. (__pthread_rwlockattr_setpshared): Ditto. (__pthread_rwlockattr_destroy): Ditto. (__pthread_getconcurrency): Ditto. (__pthread_setconcurrency): Ditto. (__pthread_getschedparam): Ditto. (__pthread_setschedparam): Ditto.
This commit is contained in:
Thomas Pfaff
@ -36,107 +36,6 @@ pthread_atfork (void (*prepare)(void), void (*parent)(void), void (*child)(void)
|
||||
return pthread::atfork (prepare, parent, child);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_init (pthread_attr_t * attr)
|
||||
{
|
||||
return __pthread_attr_init (attr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_destroy (pthread_attr_t * attr)
|
||||
{
|
||||
return __pthread_attr_destroy (attr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_setdetachstate (pthread_attr_t * attr, int detachstate)
|
||||
{
|
||||
return __pthread_attr_setdetachstate (attr, detachstate);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_getdetachstate (const pthread_attr_t * attr, int *detachstate)
|
||||
{
|
||||
return __pthread_attr_getdetachstate (attr, detachstate);
|
||||
}
|
||||
|
||||
|
||||
int
|
||||
pthread_attr_setstacksize (pthread_attr_t * attr, size_t size)
|
||||
{
|
||||
return __pthread_attr_setstacksize (attr, size);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_getstacksize (const pthread_attr_t * attr, size_t * size)
|
||||
{
|
||||
return __pthread_attr_getstacksize (attr, size);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_setinheritsched (pthread_attr_t * attr, int inheritsched)
|
||||
{
|
||||
return __pthread_attr_setinheritsched (attr, inheritsched);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_getinheritsched (const pthread_attr_t * attr, int *inheritsched)
|
||||
{
|
||||
return __pthread_attr_getinheritsched (attr, inheritsched);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_setschedparam (pthread_attr_t * attr,
|
||||
const struct sched_param *param)
|
||||
{
|
||||
return __pthread_attr_setschedparam (attr, param);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_getschedparam (const pthread_attr_t * attr,
|
||||
struct sched_param *param)
|
||||
{
|
||||
return __pthread_attr_getschedparam (attr, param);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_setschedpolicy (pthread_attr_t * attr, int policy)
|
||||
{
|
||||
return __pthread_attr_setschedpolicy (attr, policy);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_getschedpolicy (const pthread_attr_t * attr, int *policy)
|
||||
{
|
||||
return __pthread_attr_getschedpolicy (attr, policy);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_setscope (pthread_attr_t * attr, int contentionscope)
|
||||
{
|
||||
return __pthread_attr_setscope (attr, contentionscope);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_getscope (const pthread_attr_t * attr, int *contentionscope)
|
||||
{
|
||||
return __pthread_attr_getscope (attr, contentionscope);
|
||||
}
|
||||
|
||||
#ifdef _POSIX_THREAD_ATTR_STACKADDR
|
||||
int
|
||||
pthread_attr_setstackaddr (pthread_attr_t * attr, void *stackaddr)
|
||||
{
|
||||
return __pthread_attr_setstackaddr (attr, stackaddr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_attr_getstackaddr (const pthread_attr_t * attr, void **stackaddr)
|
||||
{
|
||||
return __pthread_attr_getstackaddr (attr, stackaddr);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* Thread Exit */
|
||||
void
|
||||
pthread_exit (void *value_ptr)
|
||||
@ -179,44 +78,6 @@ pthread_getsequence_np (pthread_t * thread)
|
||||
return (*thread)->getsequence_np ();
|
||||
}
|
||||
|
||||
/* Thread SpecificData */
|
||||
int
|
||||
pthread_key_create (pthread_key_t * key, void (*destructor) (void *))
|
||||
{
|
||||
return __pthread_key_create (key, destructor);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_key_delete (pthread_key_t key)
|
||||
{
|
||||
return __pthread_key_delete (key);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_setspecific (pthread_key_t key, const void *value)
|
||||
{
|
||||
return __pthread_setspecific (key, value);
|
||||
}
|
||||
|
||||
void *
|
||||
pthread_getspecific (pthread_key_t key)
|
||||
{
|
||||
return (void *) __pthread_getspecific (key);
|
||||
}
|
||||
|
||||
/* Thread signal */
|
||||
int
|
||||
pthread_kill (pthread_t thread, int sig)
|
||||
{
|
||||
return __pthread_kill (thread, sig);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_sigmask (int operation, const sigset_t * set, sigset_t * old_set)
|
||||
{
|
||||
return __pthread_sigmask (operation, set, old_set);
|
||||
}
|
||||
|
||||
/* ID */
|
||||
|
||||
pthread_t pthread_self ()
|
||||
@ -224,12 +85,6 @@ pthread_t pthread_self ()
|
||||
return pthread::self ();
|
||||
}
|
||||
|
||||
int
|
||||
pthread_equal (pthread_t t1, pthread_t t2)
|
||||
{
|
||||
return __pthread_equal (&t1, &t2);
|
||||
}
|
||||
|
||||
/* Mutexes */
|
||||
int
|
||||
pthread_mutex_init (pthread_mutex_t * mutex, const pthread_mutexattr_t * attr)
|
||||
@ -237,257 +92,20 @@ pthread_mutex_init (pthread_mutex_t * mutex, const pthread_mutexattr_t * attr)
|
||||
return pthread_mutex::init (mutex, attr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutex_lock (pthread_mutex_t * mutex)
|
||||
{
|
||||
return __pthread_mutex_lock (mutex);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutex_trylock (pthread_mutex_t * mutex)
|
||||
{
|
||||
return __pthread_mutex_trylock (mutex);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutex_unlock (pthread_mutex_t * mutex)
|
||||
{
|
||||
return __pthread_mutex_unlock (mutex);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutex_destroy (pthread_mutex_t * mutex)
|
||||
{
|
||||
return __pthread_mutex_destroy (mutex);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutex_setprioceiling (pthread_mutex_t * mutex,
|
||||
int prioceiling, int *old_ceiling)
|
||||
{
|
||||
return __pthread_mutex_setprioceiling (mutex, prioceiling, old_ceiling);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutex_getprioceiling (const pthread_mutex_t * mutex, int *prioceiling)
|
||||
{
|
||||
return __pthread_mutex_getprioceiling (mutex, prioceiling);
|
||||
}
|
||||
|
||||
|
||||
|
||||
int
|
||||
pthread_mutexattr_destroy (pthread_mutexattr_t * attr)
|
||||
{
|
||||
return __pthread_mutexattr_destroy (attr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutexattr_getprioceiling (const pthread_mutexattr_t * attr,
|
||||
int *prioceiling)
|
||||
{
|
||||
return __pthread_mutexattr_getprioceiling (attr, prioceiling);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutexattr_getprotocol (const pthread_mutexattr_t * attr,
|
||||
int *protocol)
|
||||
{
|
||||
return __pthread_mutexattr_getprotocol (attr, protocol);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutexattr_getpshared (const pthread_mutexattr_t * attr, int *pshared)
|
||||
{
|
||||
return __pthread_mutexattr_getpshared (attr, pshared);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutexattr_gettype (const pthread_mutexattr_t * attr, int *type)
|
||||
{
|
||||
return __pthread_mutexattr_gettype (attr, type);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutexattr_init (pthread_mutexattr_t * attr)
|
||||
{
|
||||
return __pthread_mutexattr_init (attr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutexattr_setprioceiling (pthread_mutexattr_t * attr, int prioceiling)
|
||||
{
|
||||
return __pthread_mutexattr_setprioceiling (attr, prioceiling);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutexattr_setprotocol (pthread_mutexattr_t * attr, int protocol)
|
||||
{
|
||||
return __pthread_mutexattr_setprotocol (attr, protocol);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutexattr_setpshared (pthread_mutexattr_t * attr, int pshared)
|
||||
{
|
||||
return __pthread_mutexattr_setpshared (attr, pshared);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_mutexattr_settype (pthread_mutexattr_t * attr, int type)
|
||||
{
|
||||
return __pthread_mutexattr_settype (attr, type);
|
||||
}
|
||||
|
||||
/* Synchronisation */
|
||||
|
||||
int
|
||||
pthread_cond_destroy (pthread_cond_t * cond)
|
||||
{
|
||||
return __pthread_cond_destroy (cond);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_cond_init (pthread_cond_t * cond, const pthread_condattr_t * attr)
|
||||
{
|
||||
return pthread_cond::init (cond, attr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_cond_signal (pthread_cond_t * cond)
|
||||
{
|
||||
return __pthread_cond_signal (cond);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_cond_broadcast (pthread_cond_t * cond)
|
||||
{
|
||||
return __pthread_cond_broadcast (cond);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_condattr_init (pthread_condattr_t * condattr)
|
||||
{
|
||||
return __pthread_condattr_init (condattr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_condattr_destroy (pthread_condattr_t * condattr)
|
||||
{
|
||||
return __pthread_condattr_destroy (condattr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_condattr_getpshared (const pthread_condattr_t * attr, int *pshared)
|
||||
{
|
||||
return __pthread_condattr_getpshared (attr, pshared);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_condattr_setpshared (pthread_condattr_t * attr, int pshared)
|
||||
{
|
||||
return __pthread_condattr_setpshared (attr, pshared);
|
||||
}
|
||||
|
||||
/* RW Locks */
|
||||
int
|
||||
pthread_rwlock_destroy (pthread_rwlock_t *rwlock)
|
||||
{
|
||||
return __pthread_rwlock_destroy (rwlock);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlock_init (pthread_rwlock_t *rwlock, const pthread_rwlockattr_t *attr)
|
||||
{
|
||||
return pthread_rwlock::init (rwlock, attr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlock_rdlock (pthread_rwlock_t *rwlock)
|
||||
{
|
||||
return __pthread_rwlock_rdlock (rwlock);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlock_tryrdlock (pthread_rwlock_t *rwlock)
|
||||
{
|
||||
return __pthread_rwlock_tryrdlock (rwlock);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlock_wrlock (pthread_rwlock_t *rwlock)
|
||||
{
|
||||
return __pthread_rwlock_wrlock (rwlock);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlock_trywrlock (pthread_rwlock_t *rwlock)
|
||||
{
|
||||
return __pthread_rwlock_trywrlock (rwlock);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlock_unlock (pthread_rwlock_t *rwlock)
|
||||
{
|
||||
return __pthread_rwlock_unlock (rwlock);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlockattr_init (pthread_rwlockattr_t *rwlockattr)
|
||||
{
|
||||
return __pthread_rwlockattr_init (rwlockattr);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlockattr_getpshared (const pthread_rwlockattr_t *attr,
|
||||
int *pshared)
|
||||
{
|
||||
return __pthread_rwlockattr_getpshared (attr, pshared);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlockattr_setpshared (pthread_rwlockattr_t *attr, int pshared)
|
||||
{
|
||||
return __pthread_rwlockattr_setpshared (attr, pshared);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_rwlockattr_destroy (pthread_rwlockattr_t *rwlockattr)
|
||||
{
|
||||
return __pthread_rwlockattr_destroy (rwlockattr);
|
||||
}
|
||||
|
||||
/* Scheduling */
|
||||
|
||||
int
|
||||
pthread_getconcurrency (void)
|
||||
{
|
||||
return __pthread_getconcurrency ();
|
||||
}
|
||||
|
||||
int
|
||||
pthread_setconcurrency (int new_level)
|
||||
{
|
||||
return __pthread_setconcurrency (new_level);
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
int
|
||||
pthread_getschedparam (pthread_t thread, int *policy,
|
||||
struct sched_param *param)
|
||||
{
|
||||
return __pthread_getschedparam (thread, policy, param);
|
||||
}
|
||||
|
||||
int
|
||||
pthread_setschedparam (pthread_t thread, int policy,
|
||||
const struct sched_param *param)
|
||||
{
|
||||
return __pthread_setschedparam (thread, policy, param);
|
||||
}
|
||||
|
||||
|
||||
/* Cancelability */
|
||||
|
||||
int
|
||||
|
||||
Reference in New Issue
Block a user