procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR other/24829 (libobjc testsuite failures)

Browse source 
PR other/24829
	PR target/24831
	* gthr-dce.h: Do not gthrw-ify pthread_once_init,
	pthread_key_delete.  From John David Anglin.  gthrw-ify
	pthread_getunique_np only if it it's not a macro.  Delete
	UNUSED macro.
	(__gthread_objc_condition_allocate, __gthread_objc_condition_deallocate,
	__gthread_objc_condition_wait, __gthread_objc_condition_broadcast,
	__gthread_objc_condition_signal, __gthread_key_delete): Add
	"__attribute__ ((__unused__))" to unused arguments.
	(__gthread_recursive_mutex_init_function): Add missing return.
	* gthr-dce.h, gthr-tpf.h, gthr-solaris.h, gthr-posix.h,
	gthr-posix95.h: Use macro-based approach for name redirection
	on targets missing weakref.

From-SVN: r110278
This commit is contained in:
Alexandre Oliva 2006-01-26 22:00:28 +00:00 • committed by John David Anglin
parent f7c8e4fc33
commit 72b167732c
6 changed files with 324 additions and 313 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gcc/ChangeLog
View file

@ -1,3 +1,20 @@
2006-01-26 Alexandre Oliva <aoliva@redhat.com>
PR other/24829
PR target/24831
* gthr-dce.h: Do not gthrw-ify pthread_once_init,
pthread_key_delete. From John David Anglin. gthrw-ify
pthread_getunique_np only if it it's not a macro. Delete
UNUSED macro.
(__gthread_objc_condition_allocate, __gthread_objc_condition_deallocate,
__gthread_objc_condition_wait, __gthread_objc_condition_broadcast,
__gthread_objc_condition_signal, __gthread_key_delete): Add
"__attribute__ ((__unused__))" to unused arguments.
(__gthread_recursive_mutex_init_function): Add missing return.
* gthr-dce.h, gthr-tpf.h, gthr-solaris.h, gthr-posix.h,
gthr-posix95.h: Use macro-based approach for name redirection
on targets missing weakref.
2006-01-26 Zack Weinberg <zackw@panix.com>
* genconditions.c (write_header): In generated code, #ifdef out

148
gcc/gthr-dce.h
View file

@ -44,62 +44,59 @@ Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
#include <pthread.h>
#ifdef __cplusplus
#define UNUSED(x) x
#else
#define UNUSED(x) x __attribute__((unused))
#endif
typedef pthread_key_t __gthread_key_t;
typedef pthread_once_t __gthread_once_t;
typedef pthread_mutex_t __gthread_mutex_t;
typedef pthread_mutex_t __gthread_recursive_mutex_t;
#define __GTHREAD_ONCE_INIT __gthrw_pthread_once_init
#define __GTHREAD_ONCE_INIT pthread_once_init
#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
#define __GTHREAD_MUTEX_INIT_DEFAULT __gthrw_pthread_once_init
#define __GTHREAD_MUTEX_INIT_DEFAULT pthread_once_init
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
# define __gthrw_(name) __gthrw_ ## name
#else
# define __gthrw_asmname(cname) __gthrw_asmnamep (__USER_LABEL_PREFIX__, cname)
# define __gthrw_asmnamep(prefix, cname) __gthrw_string (prefix) cname
# define __gthrw_string(x) #x
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __asm (__gthrw_asmname (#name))
# define __gthrw(name)
# define __gthrw_(name) name
#endif
__gthrw(pthread_once);
__gthrw(pthread_once_init);
__gthrw(pthread_keycreate);
__gthrw(pthread_key_delete);
__gthrw(pthread_getspecific);
__gthrw(pthread_setspecific);
__gthrw(pthread_create);
__gthrw(pthread_mutex_init);
__gthrw(pthread_mutex_lock);
__gthrw(pthread_mutex_trylock);
__gthrw(pthread_mutex_unlock);
__gthrw(pthread_mutexattr_create);
__gthrw(pthread_mutexattr_setkind_np);
__gthrw(pthread_mutexattr_delete);
__gthrw(pthread_once)
__gthrw(pthread_keycreate)
__gthrw(pthread_getspecific)
__gthrw(pthread_setspecific)
__gthrw(pthread_create)
__gthrw(pthread_mutex_init)
__gthrw(pthread_mutex_lock)
__gthrw(pthread_mutex_trylock)
__gthrw(pthread_mutex_unlock)
__gthrw(pthread_mutexattr_create)
__gthrw(pthread_mutexattr_setkind_np)
__gthrw(pthread_mutexattr_delete)
#ifdef _LIBOBJC
/* Objective-C. */
__gthrw(pthread_cond_broadcast);
__gthrw(pthread_cond_destroy);
__gthrw(pthread_cond_init);
__gthrw(pthread_cond_signal);
__gthrw(pthread_cond_wait);
__gthrw(pthread_exit);
__gthrw(pthread_getunique_np);
__gthrw(pthread_mutex_destroy);
__gthrw(pthread_self);
__gthrw(pthread_yield);
__gthrw(pthread_cond_broadcast)
__gthrw(pthread_cond_destroy)
__gthrw(pthread_cond_init)
__gthrw(pthread_cond_signal)
__gthrw(pthread_cond_wait)
__gthrw(pthread_exit)
#ifdef pthread_getunique_np
# define __gthrw_pthread_getunique_np pthread_getunique_np
#else
__gthrw(pthread_getunique_np)
# define __gthrw_pthread_getunique_np __gthrw_(pthread_getunique_np)
#endif
__gthrw(pthread_mutex_destroy)
__gthrw(pthread_self)
__gthrw(pthread_yield)
#endif
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
@ -107,7 +104,7 @@ __gthrw(pthread_yield);
static inline int
__gthread_active_p (void)
{
static void *const __gthread_active_ptr = (void *) &__gthrw_pthread_create;
static void *const __gthread_active_ptr = (void *) &__gthrw_(pthread_create);
return __gthread_active_ptr != 0;
}
@ -137,7 +134,7 @@ __gthread_objc_init_thread_system (void)
{
if (__gthread_active_p ())
/* Initialize the thread storage key. */
return __gthrw_pthread_keycreate (&_objc_thread_storage, NULL);
return __gthrw_(pthread_keycreate) (&_objc_thread_storage, NULL);
else
return -1;
}
@ -164,7 +161,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
if (!__gthread_active_p ())
return NULL;
if (!(__gthrw_pthread_create (&new_thread_handle, pthread_attr_default,
if (!(__gthrw_(pthread_create) (&new_thread_handle, pthread_attr_default,
(void *) func, arg)))
{
/* ??? May not work! (64bit) */
@ -201,7 +198,7 @@ __gthread_objc_thread_set_priority (int priority)
}
/* Change the priority. */
if (pthread_setprio (__gthrw_pthread_self (), sys_priority) >= 0)
if (pthread_setprio (__gthrw_(pthread_self) (), sys_priority) >= 0)
return 0;
else
/* Failed */
@ -216,7 +213,7 @@ __gthread_objc_thread_get_priority (void)
if (__gthread_active_p ())
{
if ((sys_priority = pthread_getprio (__gthrw_pthread_self ())) >= 0)
if ((sys_priority = pthread_getprio (__gthrw_(pthread_self) ())) >= 0)
{
if (sys_priority >= PRI_FG_MIN_NP
&& sys_priority <= PRI_FG_MAX_NP)
@ -239,7 +236,7 @@ static inline void
__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
__gthrw_pthread_yield ();
__gthrw_(pthread_yield) ();
}
/* Terminate the current thread. */
@ -248,7 +245,7 @@ __gthread_objc_thread_exit (void)
{
if (__gthread_active_p ())
/* exit the thread */
__gthrw_pthread_exit (&__objc_thread_exit_status);
__gthrw_(pthread_exit) (&__objc_thread_exit_status);
/* Failed if we reached here */
return -1;
@ -260,7 +257,7 @@ __gthread_objc_thread_id (void)
{
if (__gthread_active_p ())
{
pthread_t self = __gthrw_pthread_self ();
pthread_t self = __gthrw_(pthread_self) ();
return (objc_thread_t) __gthrw_pthread_getunique_np (&self);
}
@ -273,7 +270,7 @@ static inline int
__gthread_objc_thread_set_data (void *value)
{
if (__gthread_active_p ())
return __gthrw_pthread_setspecific (_objc_thread_storage, value);
return __gthrw_(pthread_setspecific) (_objc_thread_storage, value);
else
{
thread_local_storage = value;
@ -289,7 +286,7 @@ __gthread_objc_thread_get_data (void)
if (__gthread_active_p ())
{
if (!(__gthrw_pthread_getspecific (_objc_thread_storage, &value)))
if (!(__gthrw_(pthread_getspecific) (_objc_thread_storage, &value)))
return value;
return NULL;
@ -308,7 +305,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex)
{
mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
if (__gthrw_pthread_mutex_init ((pthread_mutex_t *) mutex->backend,
if (__gthrw_(pthread_mutex_init) ((pthread_mutex_t *) mutex->backend,
pthread_mutexattr_default))
{
objc_free (mutex->backend);
@ -326,7 +323,7 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
{
if (__gthread_active_p ())
{
if (__gthrw_pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
if (__gthrw_(pthread_mutex_destroy) ((pthread_mutex_t *) mutex->backend))
return -1;
objc_free (mutex->backend);
@ -341,7 +338,7 @@ static inline int
__gthread_objc_mutex_lock (objc_mutex_t mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_lock ((pthread_mutex_t *) mutex->backend);
return __gthrw_(pthread_mutex_lock) ((pthread_mutex_t *) mutex->backend);
else
return 0;
}
@ -351,7 +348,7 @@ static inline int
__gthread_objc_mutex_trylock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 1)
&& __gthrw_(pthread_mutex_trylock) ((pthread_mutex_t *) mutex->backend) != 1)
return -1;
return 0;
@ -362,7 +359,7 @@ static inline int
__gthread_objc_mutex_unlock (objc_mutex_t mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
return __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend);
else
return 0;
}
@ -371,7 +368,8 @@ __gthread_objc_mutex_unlock (objc_mutex_t mutex)
/* Allocate a condition. */
static inline int
__gthread_objc_condition_allocate (objc_condition_t condition)
__gthread_objc_condition_allocate (objc_condition_t condition
__attribute__ ((__unused__)))
{
if (__gthread_active_p ())
/* Unimplemented. */
@ -382,7 +380,8 @@ __gthread_objc_condition_allocate (objc_condition_t condition)
/* Deallocate a condition. */
static inline int
__gthread_objc_condition_deallocate (objc_condition_t condition)
__gthread_objc_condition_deallocate (objc_condition_t condition
__attribute__ ((__unused__)))
{
if (__gthread_active_p ())
/* Unimplemented. */
@ -393,7 +392,9 @@ __gthread_objc_condition_deallocate (objc_condition_t condition)
/* Wait on the condition */
static inline int
__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
__gthread_objc_condition_wait (objc_condition_t condition
__attribute__ ((__unused__)),
objc_mutex_t mutex __attribute__ ((__unused__)))
{
if (__gthread_active_p ())
/* Unimplemented. */
@ -404,7 +405,8 @@ __gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
/* Wake up all threads waiting on this condition. */
static inline int
__gthread_objc_condition_broadcast (objc_condition_t condition)
__gthread_objc_condition_broadcast (objc_condition_t condition
__attribute__ ((__unused__)))
{
if (__gthread_active_p ())
/* Unimplemented. */
@ -415,7 +417,8 @@ __gthread_objc_condition_broadcast (objc_condition_t condition)
/* Wake up one thread waiting on this condition. */
static inline int
__gthread_objc_condition_signal (objc_condition_t condition)
__gthread_objc_condition_signal (objc_condition_t condition
__attribute__ ((__unused__)))
{
if (__gthread_active_p ())
/* Unimplemented. */
@ -430,7 +433,7 @@ static inline int
__gthread_once (__gthread_once_t *once, void (*func) (void))
{
if (__gthread_active_p ())
return __gthrw_pthread_once (once, func);
return __gthrw_(pthread_once) (once, func);
else
return -1;
}
@ -438,11 +441,11 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
static inline int
__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
{
return __gthrw_pthread_keycreate (key, dtor);
return __gthrw_(pthread_keycreate) (key, dtor);
}
static inline int
__gthread_key_delete (UNUSED (__gthread_key_t key))
__gthread_key_delete (__gthread_key_t key __attribute__ ((__unused__)))
{
/* Operation is not supported. */
return -1;
@ -452,7 +455,7 @@ static inline void *
__gthread_getspecific (__gthread_key_t key)
{
void *ptr;
if (__gthrw_pthread_getspecific (key, &ptr) == 0)
if (__gthrw_(pthread_getspecific) (key, &ptr) == 0)
return ptr;
else
return 0;
@ -461,21 +464,21 @@ __gthread_getspecific (__gthread_key_t key)
static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr)
{
return __gthrw_pthread_setspecific (key, (void *) ptr);
return __gthrw_(pthread_setspecific) (key, (void *) ptr);
}
static inline void
__gthread_mutex_init_function (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
__gthrw_pthread_mutex_init (mutex, pthread_mutexattr_default);
__gthrw_(pthread_mutex_init) (mutex, pthread_mutexattr_default);
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_lock (mutex);
return __gthrw_(pthread_mutex_lock) (mutex);
else
return 0;
}
@ -484,7 +487,7 @@ static inline int
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_trylock (mutex);
return __gthrw_(pthread_mutex_trylock) (mutex);
else
return 0;
}
@ -493,7 +496,7 @@ static inline int
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_unlock (mutex);
return __gthrw_(pthread_mutex_unlock) (mutex);
else
return 0;
}
@ -506,15 +509,16 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
pthread_mutexattr_t attr;
int r;
r = __gthrw_pthread_mutexattr_create (&attr);
r = __gthrw_(pthread_mutexattr_create) (&attr);
if (!r)
r = __gthrw_pthread_mutexattr_setkind_np (&attr, MUTEX_RECURSIVE_NP);
r = __gthrw_(pthread_mutexattr_setkind_np) (&attr, MUTEX_RECURSIVE_NP);
if (!r)
r = __gthrw_pthread_mutex_init (mutex, attr);
r = __gthrw_(pthread_mutex_init) (mutex, attr);
if (!r)
r = __gthrw_pthread_mutexattr_delete (&attr);
r = __gthrw_(pthread_mutexattr_delete) (&attr);
return r;
}
return 0;
}
static inline int
@ -537,7 +541,5 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
#endif /* _LIBOBJC */
#undef UNUSED
#endif
#endif /* ! GCC_GTHR_DCE_H */

154
gcc/gthr-posix.h
View file

@ -60,55 +60,53 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t;
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
# define __gthrw_(name) __gthrw_ ## name
#else
# define __gthrw_asmname(cname) __gthrw_asmnamep (__USER_LABEL_PREFIX__, cname)
# define __gthrw_asmnamep(prefix, cname) __gthrw_string (prefix) cname
# define __gthrw_string(x) #x
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __asm (__gthrw_asmname (#name))
# define __gthrw(name)
# define __gthrw_(name) name
#endif
__gthrw(pthread_once);
__gthrw(pthread_key_create);
__gthrw(pthread_key_delete);
__gthrw(pthread_getspecific);
__gthrw(pthread_setspecific);
__gthrw(pthread_create);
__gthrw(pthread_cancel);
__gthrw(pthread_once)
__gthrw(pthread_key_create)
__gthrw(pthread_key_delete)
__gthrw(pthread_getspecific)
__gthrw(pthread_setspecific)
__gthrw(pthread_create)
__gthrw(pthread_cancel)
__gthrw(pthread_mutex_lock);
__gthrw(pthread_mutex_trylock);
__gthrw(pthread_mutex_unlock);
__gthrw(pthread_mutexattr_init);
__gthrw(pthread_mutexattr_settype);
__gthrw(pthread_mutexattr_destroy);
__gthrw(pthread_mutex_lock)
__gthrw(pthread_mutex_trylock)
__gthrw(pthread_mutex_unlock)
__gthrw(pthread_mutexattr_init)
__gthrw(pthread_mutexattr_settype)
__gthrw(pthread_mutexattr_destroy)
__gthrw(pthread_mutex_init);
__gthrw(pthread_mutex_init)
#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
/* Objective-C. */
__gthrw(pthread_cond_broadcast);
__gthrw(pthread_cond_destroy);
__gthrw(pthread_cond_init);
__gthrw(pthread_cond_signal);
__gthrw(pthread_cond_wait);
__gthrw(pthread_exit);
__gthrw(pthread_mutex_destroy);
__gthrw(pthread_self);
__gthrw(pthread_cond_broadcast)
__gthrw(pthread_cond_destroy)
__gthrw(pthread_cond_init)
__gthrw(pthread_cond_signal)
__gthrw(pthread_cond_wait)
__gthrw(pthread_exit)
__gthrw(pthread_mutex_destroy)
__gthrw(pthread_self)
#ifdef _POSIX_PRIORITY_SCHEDULING
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
__gthrw(sched_get_priority_max);
__gthrw(sched_get_priority_min);
__gthrw(sched_get_priority_max)
__gthrw(sched_get_priority_min)
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _POSIX_PRIORITY_SCHEDULING */
__gthrw(sched_yield);
__gthrw(pthread_attr_destroy);
__gthrw(pthread_attr_init);
__gthrw(pthread_attr_setdetachstate);
__gthrw(sched_yield)
__gthrw(pthread_attr_destroy)
__gthrw(pthread_attr_init)
__gthrw(pthread_attr_setdetachstate)
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
__gthrw(pthread_getschedparam);
__gthrw(pthread_setschedparam);
__gthrw(pthread_getschedparam)
__gthrw(pthread_setschedparam)
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _LIBOBJC || _LIBOBJC_WEAK */
@ -118,7 +116,7 @@ static inline int
__gthread_active_p (void)
{
static void *const __gthread_active_ptr
= __extension__ (void *) &__gthrw_pthread_cancel;
= __extension__ (void *) &__gthrw_(pthread_cancel);
return __gthread_active_ptr != 0;
}
@ -157,13 +155,13 @@ __gthread_objc_init_thread_system (void)
if (__gthread_active_p ())
{
/* Initialize the thread storage key. */
if (__gthrw_pthread_key_create (&_objc_thread_storage, NULL) == 0)
if (__gthrw_(pthread_key_create) (&_objc_thread_storage, NULL) == 0)
{
/* The normal default detach state for threads is
* PTHREAD_CREATE_JOINABLE which causes threads to not die
* when you think they should. */
if (__gthrw_pthread_attr_init (&_objc_thread_attribs) == 0
&& __gthrw_pthread_attr_setdetachstate (&_objc_thread_attribs,
if (__gthrw_(pthread_attr_init) (&_objc_thread_attribs) == 0
&& __gthrw_(pthread_attr_setdetachstate) (&_objc_thread_attribs,
PTHREAD_CREATE_DETACHED) == 0)
return 0;
}
@ -177,8 +175,8 @@ static inline int
__gthread_objc_close_thread_system (void)
{
if (__gthread_active_p ()
&& __gthrw_pthread_key_delete (_objc_thread_storage) == 0
&& __gthrw_pthread_attr_destroy (&_objc_thread_attribs) == 0)
&& __gthrw_(pthread_key_delete) (_objc_thread_storage) == 0
&& __gthrw_(pthread_attr_destroy) (&_objc_thread_attribs) == 0)
return 0;
return -1;
@ -196,7 +194,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
if (!__gthread_active_p ())
return NULL;
if (!(__gthrw_pthread_create (&new_thread_handle, NULL, (void *) func, arg)))
if (!(__gthrw_(pthread_create) (&new_thread_handle, NULL, (void *) func, arg)))
thread_id = (objc_thread_t) new_thread_handle;
else
thread_id = NULL;
@ -214,17 +212,17 @@ __gthread_objc_thread_set_priority (int priority)
{
#ifdef _POSIX_PRIORITY_SCHEDULING
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
pthread_t thread_id = __gthrw_pthread_self ();
pthread_t thread_id = __gthrw_(pthread_self) ();
int policy;
struct sched_param params;
int priority_min, priority_max;
if (__gthrw_pthread_getschedparam (thread_id, &policy, &params) == 0)
if (__gthrw_(pthread_getschedparam) (thread_id, &policy, &params) == 0)
{
if ((priority_max = __gthrw_sched_get_priority_max (policy)) == -1)
if ((priority_max = __gthrw_(sched_get_priority_max) (policy)) == -1)
return -1;
if ((priority_min = __gthrw_sched_get_priority_min (policy)) == -1)
if ((priority_min = __gthrw_(sched_get_priority_min) (policy)) == -1)
return -1;
if (priority > priority_max)
@ -238,7 +236,7 @@ __gthread_objc_thread_set_priority (int priority)
* this should be a pointer to policy but pthread.h is universally
* at odds with this.
*/
if (__gthrw_pthread_setschedparam (thread_id, policy, &params) == 0)
if (__gthrw_(pthread_setschedparam) (thread_id, policy, &params) == 0)
return 0;
}
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
@ -258,7 +256,7 @@ __gthread_objc_thread_get_priority (void)
int policy;
struct sched_param params;
if (__gthrw_pthread_getschedparam (__gthrw_pthread_self (), &policy, &params) == 0)
if (__gthrw_(pthread_getschedparam) (__gthrw_(pthread_self) (), &policy, &params) == 0)
return params.sched_priority;
else
return -1;
@ -274,7 +272,7 @@ static inline void
__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
__gthrw_sched_yield ();
__gthrw_(sched_yield) ();
}
/* Terminate the current thread. */
@ -283,7 +281,7 @@ __gthread_objc_thread_exit (void)
{
if (__gthread_active_p ())
/* exit the thread */
__gthrw_pthread_exit (&__objc_thread_exit_status);
__gthrw_(pthread_exit) (&__objc_thread_exit_status);
/* Failed if we reached here */
return -1;
@ -294,7 +292,7 @@ static inline objc_thread_t
__gthread_objc_thread_id (void)
{
if (__gthread_active_p ())
return (objc_thread_t) __gthrw_pthread_self ();
return (objc_thread_t) __gthrw_(pthread_self) ();
else
return (objc_thread_t) 1;
}
@ -304,7 +302,7 @@ static inline int
__gthread_objc_thread_set_data (void *value)
{
if (__gthread_active_p ())
return __gthrw_pthread_setspecific (_objc_thread_storage, value);
return __gthrw_(pthread_setspecific) (_objc_thread_storage, value);
else
{
thread_local_storage = value;
@ -317,7 +315,7 @@ static inline void *
__gthread_objc_thread_get_data (void)
{
if (__gthread_active_p ())
return __gthrw_pthread_getspecific (_objc_thread_storage);
return __gthrw_(pthread_getspecific) (_objc_thread_storage);
else
return thread_local_storage;
}
@ -332,7 +330,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex)
{
mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
if (__gthrw_pthread_mutex_init ((pthread_mutex_t *) mutex->backend, NULL))
if (__gthrw_(pthread_mutex_init) ((pthread_mutex_t *) mutex->backend, NULL))
{
objc_free (mutex->backend);
mutex->backend = NULL;
@ -353,18 +351,18 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
/*
* Posix Threads specifically require that the thread be unlocked
* for __gthrw_pthread_mutex_destroy to work.
* for __gthrw_(pthread_mutex_destroy) to work.
*/
do
{
count = __gthrw_pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
count = __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend);
if (count < 0)
return -1;
}
while (count);
if (__gthrw_pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
if (__gthrw_(pthread_mutex_destroy) ((pthread_mutex_t *) mutex->backend))
return -1;
objc_free (mutex->backend);
@ -378,7 +376,7 @@ static inline int
__gthread_objc_mutex_lock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_pthread_mutex_lock ((pthread_mutex_t *) mutex->backend) != 0)
&& __gthrw_(pthread_mutex_lock) ((pthread_mutex_t *) mutex->backend) != 0)
{
return -1;
}
@ -391,7 +389,7 @@ static inline int
__gthread_objc_mutex_trylock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 0)
&& __gthrw_(pthread_mutex_trylock) ((pthread_mutex_t *) mutex->backend) != 0)
{
return -1;
}
@ -404,7 +402,7 @@ static inline int
__gthread_objc_mutex_unlock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend) != 0)
&& __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend) != 0)
{
return -1;
}
@ -422,7 +420,7 @@ __gthread_objc_condition_allocate (objc_condition_t condition)
{
condition->backend = objc_malloc (sizeof (pthread_cond_t));
if (__gthrw_pthread_cond_init ((pthread_cond_t *) condition->backend, NULL))
if (__gthrw_(pthread_cond_init) ((pthread_cond_t *) condition->backend, NULL))
{
objc_free (condition->backend);
condition->backend = NULL;
@ -439,7 +437,7 @@ __gthread_objc_condition_deallocate (objc_condition_t condition)
{
if (__gthread_active_p ())
{
if (__gthrw_pthread_cond_destroy ((pthread_cond_t *) condition->backend))
if (__gthrw_(pthread_cond_destroy) ((pthread_cond_t *) condition->backend))
return -1;
objc_free (condition->backend);
@ -453,7 +451,7 @@ static inline int
__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_cond_wait ((pthread_cond_t *) condition->backend,
return __gthrw_(pthread_cond_wait) ((pthread_cond_t *) condition->backend,
(pthread_mutex_t *) mutex->backend);
else
return 0;
@ -464,7 +462,7 @@ static inline int
__gthread_objc_condition_broadcast (objc_condition_t condition)
{
if (__gthread_active_p ())
return __gthrw_pthread_cond_broadcast ((pthread_cond_t *) condition->backend);
return __gthrw_(pthread_cond_broadcast) ((pthread_cond_t *) condition->backend);
else
return 0;
}
@ -474,7 +472,7 @@ static inline int
__gthread_objc_condition_signal (objc_condition_t condition)
{
if (__gthread_active_p ())
return __gthrw_pthread_cond_signal ((pthread_cond_t *) condition->backend);
return __gthrw_(pthread_cond_signal) ((pthread_cond_t *) condition->backend);
else
return 0;
}
@ -485,7 +483,7 @@ static inline int
__gthread_once (__gthread_once_t *once, void (*func) (void))
{
if (__gthread_active_p ())
return __gthrw_pthread_once (once, func);
return __gthrw_(pthread_once) (once, func);
else
return -1;
}
@ -493,32 +491,32 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
static inline int
__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
{
return __gthrw_pthread_key_create (key, dtor);
return __gthrw_(pthread_key_create) (key, dtor);
}
static inline int
__gthread_key_delete (__gthread_key_t key)
{
return __gthrw_pthread_key_delete (key);
return __gthrw_(pthread_key_delete) (key);
}
static inline void *
__gthread_getspecific (__gthread_key_t key)
{
return __gthrw_pthread_getspecific (key);
return __gthrw_(pthread_getspecific) (key);
}
static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr)
{
return __gthrw_pthread_setspecific (key, ptr);
return __gthrw_(pthread_setspecific) (key, ptr);
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_lock (mutex);
return __gthrw_(pthread_mutex_lock) (mutex);
else
return 0;
}
@ -527,7 +525,7 @@ static inline int
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_trylock (mutex);
return __gthrw_(pthread_mutex_trylock) (mutex);
else
return 0;
}
@ -536,7 +534,7 @@ static inline int
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_unlock (mutex);
return __gthrw_(pthread_mutex_unlock) (mutex);
else
return 0;
}
@ -550,13 +548,13 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
pthread_mutexattr_t attr;
int r;
r = __gthrw_pthread_mutexattr_init (&attr);
r = __gthrw_(pthread_mutexattr_init) (&attr);
if (!r)
r = __gthrw_pthread_mutexattr_settype (&attr, PTHREAD_MUTEX_RECURSIVE);
r = __gthrw_(pthread_mutexattr_settype) (&attr, PTHREAD_MUTEX_RECURSIVE);
if (!r)
r = __gthrw_pthread_mutex_init (mutex, &attr);
r = __gthrw_(pthread_mutex_init) (mutex, &attr);
if (!r)
r = __gthrw_pthread_mutexattr_destroy (&attr);
r = __gthrw_(pthread_mutexattr_destroy) (&attr);
return r;
}
return 0;

156
gcc/gthr-posix95.h
View file

@ -58,54 +58,52 @@ typedef struct {
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
# define __gthrw_(name) __gthrw_ ## name
#else
# define __gthrw_asmname(cname) __gthrw_asmnamep (__USER_LABEL_PREFIX__, cname)
# define __gthrw_asmnamep(prefix, cname) __gthrw_string (prefix) cname
# define __gthrw_string(x) #x
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __asm (__gthrw_asmname (#name))
# define __gthrw(name)
# define __gthrw_(name) name
#endif
__gthrw(pthread_once);
__gthrw(pthread_key_create);
__gthrw(pthread_key_delete);
__gthrw(pthread_getspecific);
__gthrw(pthread_setspecific);
__gthrw(pthread_create);
__gthrw(pthread_cancel);
__gthrw(pthread_self);
__gthrw(pthread_once)
__gthrw(pthread_key_create)
__gthrw(pthread_key_delete)
__gthrw(pthread_getspecific)
__gthrw(pthread_setspecific)
__gthrw(pthread_create)
__gthrw(pthread_cancel)
__gthrw(pthread_self)
__gthrw(pthread_mutex_lock);
__gthrw(pthread_mutex_trylock);
__gthrw(pthread_mutex_unlock);
__gthrw(pthread_mutexattr_init);
__gthrw(pthread_mutexattr_destroy);
__gthrw(pthread_mutex_lock)
__gthrw(pthread_mutex_trylock)
__gthrw(pthread_mutex_unlock)
__gthrw(pthread_mutexattr_init)
__gthrw(pthread_mutexattr_destroy)
__gthrw(pthread_mutex_init);
__gthrw(pthread_mutex_init)
#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK)
/* Objective-C. */
__gthrw(pthread_cond_broadcast);
__gthrw(pthread_cond_destroy);
__gthrw(pthread_cond_init);
__gthrw(pthread_cond_signal);
__gthrw(pthread_cond_wait);
__gthrw(pthread_exit);
__gthrw(pthread_mutex_destroy);
__gthrw(pthread_cond_broadcast)
__gthrw(pthread_cond_destroy)
__gthrw(pthread_cond_init)
__gthrw(pthread_cond_signal)
__gthrw(pthread_cond_wait)
__gthrw(pthread_exit)
__gthrw(pthread_mutex_destroy)
#ifdef _POSIX_PRIORITY_SCHEDULING
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
__gthrw(sched_get_priority_max);
__gthrw(sched_get_priority_min);
__gthrw(sched_get_priority_max)
__gthrw(sched_get_priority_min)
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _POSIX_PRIORITY_SCHEDULING */
__gthrw(sched_yield);
__gthrw(pthread_attr_destroy);
__gthrw(pthread_attr_init);
__gthrw(pthread_attr_setdetachstate);
__gthrw(sched_yield)
__gthrw(pthread_attr_destroy)
__gthrw(pthread_attr_init)
__gthrw(pthread_attr_setdetachstate)
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
__gthrw(pthread_getschedparam);
__gthrw(pthread_setschedparam);
__gthrw(pthread_getschedparam)
__gthrw(pthread_setschedparam)
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
#endif /* _LIBOBJC || _LIBOBJC_WEAK */
@ -115,7 +113,7 @@ static inline int
__gthread_active_p (void)
{
static void *const __gthread_active_ptr
= __extension__ (void *) &__gthrw_pthread_cancel;
= __extension__ (void *) &__gthrw_(pthread_cancel);
return __gthread_active_ptr != 0;
}
@ -154,13 +152,13 @@ __gthread_objc_init_thread_system (void)
if (__gthread_active_p ())
{
/* Initialize the thread storage key. */
if (__gthrw_pthread_key_create (&_objc_thread_storage, NULL) == 0)
if (__gthrw_(pthread_key_create) (&_objc_thread_storage, NULL) == 0)
{
/* The normal default detach state for threads is
* PTHREAD_CREATE_JOINABLE which causes threads to not die
* when you think they should. */
if (__gthrw_pthread_attr_init (&_objc_thread_attribs) == 0
&& __gthrw_pthread_attr_setdetachstate (&_objc_thread_attribs,
if (__gthrw_(pthread_attr_init) (&_objc_thread_attribs) == 0
&& __gthrw_(pthread_attr_setdetachstate) (&_objc_thread_attribs,
PTHREAD_CREATE_DETACHED) == 0)
return 0;
}
@ -174,8 +172,8 @@ static inline int
__gthread_objc_close_thread_system (void)
{
if (__gthread_active_p ()
&& __gthrw_pthread_key_delete (_objc_thread_storage) == 0
&& __gthrw_pthread_attr_destroy (&_objc_thread_attribs) == 0)
&& __gthrw_(pthread_key_delete) (_objc_thread_storage) == 0
&& __gthrw_(pthread_attr_destroy) (&_objc_thread_attribs) == 0)
return 0;
return -1;
@ -193,7 +191,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
if (!__gthread_active_p ())
return NULL;
if (!(__gthrw_pthread_create (&new_thread_handle, NULL, (void *) func, arg)))
if (!(__gthrw_(pthread_create) (&new_thread_handle, NULL, (void *) func, arg)))
thread_id = (objc_thread_t) new_thread_handle;
else
thread_id = NULL;
@ -211,17 +209,17 @@ __gthread_objc_thread_set_priority (int priority)
{
#ifdef _POSIX_PRIORITY_SCHEDULING
#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING
pthread_t thread_id = __gthrw_pthread_self ();
pthread_t thread_id = __gthrw_(pthread_self) ();
int policy;
struct sched_param params;
int priority_min, priority_max;
if (__gthrw_pthread_getschedparam (thread_id, &policy, &params) == 0)
if (__gthrw_(pthread_getschedparam) (thread_id, &policy, &params) == 0)
{
if ((priority_max = __gthrw_sched_get_priority_max (policy)) == -1)
if ((priority_max = __gthrw_(sched_get_priority_max) (policy)) == -1)
return -1;
if ((priority_min = __gthrw_sched_get_priority_min (policy)) == -1)
if ((priority_min = __gthrw_(sched_get_priority_min) (policy)) == -1)
return -1;
if (priority > priority_max)
@ -235,7 +233,7 @@ __gthread_objc_thread_set_priority (int priority)
* this should be a pointer to policy but pthread.h is universally
* at odds with this.
*/
if (__gthrw_pthread_setschedparam (thread_id, policy, &params) == 0)
if (__gthrw_(pthread_setschedparam) (thread_id, policy, &params) == 0)
return 0;
}
#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */
@ -255,7 +253,7 @@ __gthread_objc_thread_get_priority (void)
int policy;
struct sched_param params;
if (__gthrw_pthread_getschedparam (__gthrw_pthread_self (), &policy, &params) == 0)
if (__gthrw_(pthread_getschedparam) (__gthrw_(pthread_self) (), &policy, &params) == 0)
return params.sched_priority;
else
return -1;
@ -271,7 +269,7 @@ static inline void
__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
__gthrw_sched_yield ();
__gthrw_(sched_yield) ();
}
/* Terminate the current thread. */
@ -280,7 +278,7 @@ __gthread_objc_thread_exit (void)
{
if (__gthread_active_p ())
/* exit the thread */
__gthrw_pthread_exit (&__objc_thread_exit_status);
__gthrw_(pthread_exit) (&__objc_thread_exit_status);
/* Failed if we reached here */
return -1;
@ -291,7 +289,7 @@ static inline objc_thread_t
__gthread_objc_thread_id (void)
{
if (__gthread_active_p ())
return (objc_thread_t) __gthrw_pthread_self ();
return (objc_thread_t) __gthrw_(pthread_self) ();
else
return (objc_thread_t) 1;
}
@ -301,7 +299,7 @@ static inline int
__gthread_objc_thread_set_data (void *value)
{
if (__gthread_active_p ())
return __gthrw_pthread_setspecific (_objc_thread_storage, value);
return __gthrw_(pthread_setspecific) (_objc_thread_storage, value);
else
{
thread_local_storage = value;
@ -314,7 +312,7 @@ static inline void *
__gthread_objc_thread_get_data (void)
{
if (__gthread_active_p ())
return __gthrw_pthread_getspecific (_objc_thread_storage);
return __gthrw_(pthread_getspecific) (_objc_thread_storage);
else
return thread_local_storage;
}
@ -329,7 +327,7 @@ __gthread_objc_mutex_allocate (objc_mutex_t mutex)
{
mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
if (__gthrw_pthread_mutex_init ((pthread_mutex_t *) mutex->backend, NULL))
if (__gthrw_(pthread_mutex_init) ((pthread_mutex_t *) mutex->backend, NULL))
{
objc_free (mutex->backend);
mutex->backend = NULL;
@ -350,18 +348,18 @@ __gthread_objc_mutex_deallocate (objc_mutex_t mutex)
/*
* Posix Threads specifically require that the thread be unlocked
* for __gthrw_pthread_mutex_destroy to work.
* for __gthrw_(pthread_mutex_destroy) to work.
*/
do
{
count = __gthrw_pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend);
count = __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend);
if (count < 0)
return -1;
}
while (count);
if (__gthrw_pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend))
if (__gthrw_(pthread_mutex_destroy) ((pthread_mutex_t *) mutex->backend))
return -1;
objc_free (mutex->backend);
@ -375,7 +373,7 @@ static inline int
__gthread_objc_mutex_lock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_pthread_mutex_lock ((pthread_mutex_t *) mutex->backend) != 0)
&& __gthrw_(pthread_mutex_lock) ((pthread_mutex_t *) mutex->backend) != 0)
{
return -1;
}
@ -388,7 +386,7 @@ static inline int
__gthread_objc_mutex_trylock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 0)
&& __gthrw_(pthread_mutex_trylock) ((pthread_mutex_t *) mutex->backend) != 0)
{
return -1;
}
@ -401,7 +399,7 @@ static inline int
__gthread_objc_mutex_unlock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend) != 0)
&& __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend) != 0)
{
return -1;
}
@ -419,7 +417,7 @@ __gthread_objc_condition_allocate (objc_condition_t condition)
{
condition->backend = objc_malloc (sizeof (pthread_cond_t));
if (__gthrw_pthread_cond_init ((pthread_cond_t *) condition->backend, NULL))
if (__gthrw_(pthread_cond_init) ((pthread_cond_t *) condition->backend, NULL))
{
objc_free (condition->backend);
condition->backend = NULL;
@ -436,7 +434,7 @@ __gthread_objc_condition_deallocate (objc_condition_t condition)
{
if (__gthread_active_p ())
{
if (__gthrw_pthread_cond_destroy ((pthread_cond_t *) condition->backend))
if (__gthrw_(pthread_cond_destroy) ((pthread_cond_t *) condition->backend))
return -1;
objc_free (condition->backend);
@ -450,7 +448,7 @@ static inline int
__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_cond_wait ((pthread_cond_t *) condition->backend,
return __gthrw_(pthread_cond_wait) ((pthread_cond_t *) condition->backend,
(pthread_mutex_t *) mutex->backend);
else
return 0;
@ -461,7 +459,7 @@ static inline int
__gthread_objc_condition_broadcast (objc_condition_t condition)
{
if (__gthread_active_p ())
return __gthrw_pthread_cond_broadcast ((pthread_cond_t *) condition->backend);
return __gthrw_(pthread_cond_broadcast) ((pthread_cond_t *) condition->backend);
else
return 0;
}
@ -471,7 +469,7 @@ static inline int
__gthread_objc_condition_signal (objc_condition_t condition)
{
if (__gthread_active_p ())
return __gthrw_pthread_cond_signal ((pthread_cond_t *) condition->backend);
return __gthrw_(pthread_cond_signal) ((pthread_cond_t *) condition->backend);
else
return 0;
}
@ -482,7 +480,7 @@ static inline int
__gthread_once (__gthread_once_t *once, void (*func) (void))
{
if (__gthread_active_p ())
return __gthrw_pthread_once (once, func);
return __gthrw_(pthread_once) (once, func);
else
return -1;
}
@ -490,32 +488,32 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
static inline int
__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
{
return __gthrw_pthread_key_create (key, dtor);
return __gthrw_(pthread_key_create) (key, dtor);
}
static inline int
__gthread_key_delete (__gthread_key_t key)
{
return __gthrw_pthread_key_delete (key);
return __gthrw_(pthread_key_delete) (key);
}
static inline void *
__gthread_getspecific (__gthread_key_t key)
{
return __gthrw_pthread_getspecific (key);
return __gthrw_(pthread_getspecific) (key);
}
static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr)
{
return __gthrw_pthread_setspecific (key, ptr);
return __gthrw_(pthread_setspecific) (key, ptr);
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_lock (mutex);
return __gthrw_(pthread_mutex_lock) (mutex);
else
return 0;
}
@ -524,7 +522,7 @@ static inline int
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_trylock (mutex);
return __gthrw_(pthread_mutex_trylock) (mutex);
else
return 0;
}
@ -533,7 +531,7 @@ static inline int
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_pthread_mutex_unlock (mutex);
return __gthrw_(pthread_mutex_unlock) (mutex);
else
return 0;
}
@ -543,7 +541,7 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
{
mutex->depth = 0;
mutex->owner = (pthread_t) 0;
return __gthrw_pthread_mutex_init (&mutex->actual, NULL);
return __gthrw_(pthread_mutex_init) (&mutex->actual, NULL);
}
static inline int
@ -551,11 +549,11 @@ __gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
{
if (__gthread_active_p ())
{
pthread_t me = __gthrw_pthread_self ();
pthread_t me = __gthrw_(pthread_self) ();
if (mutex->owner != me)
{
__gthrw_pthread_mutex_lock (&mutex->actual);
__gthrw_(pthread_mutex_lock) (&mutex->actual);
mutex->owner = me;
}
@ -569,11 +567,11 @@ __gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
{
if (__gthread_active_p ())
{
pthread_t me = __gthrw_pthread_self ();
pthread_t me = __gthrw_(pthread_self) ();
if (mutex->owner != me)
{
if (__gthrw_pthread_mutex_trylock (&mutex->actual))
if (__gthrw_(pthread_mutex_trylock) (&mutex->actual))
return 1;
mutex->owner = me;
}
@ -591,7 +589,7 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
if (--mutex->depth == 0)
{
mutex->owner = (pthread_t) 0;
__gthrw_pthread_mutex_unlock (&mutex->actual);
__gthrw_(pthread_mutex_unlock) (&mutex->actual);
}
}
return 0;

118
gcc/gthr-solaris.h
View file

@ -58,40 +58,38 @@ typedef struct {
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
# define __gthrw_(name) __gthrw_ ## name
#else
# define __gthrw_asmname(cname) __gthrw_asmnamep (__USER_LABEL_PREFIX__, cname)
# define __gthrw_asmnamep(prefix, cname) __gthrw_string (prefix) cname
# define __gthrw_string(x) #x
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __asm (__gthrw_asmname (#name))
# define __gthrw(name)
# define __gthrw_(name) name
#endif
__gthrw(thr_keycreate);
__gthrw(thr_getspecific);
__gthrw(thr_setspecific);
__gthrw(thr_create);
__gthrw(thr_keycreate)
__gthrw(thr_getspecific)
__gthrw(thr_setspecific)
__gthrw(thr_create)
__gthrw(mutex_lock);
__gthrw(mutex_trylock);
__gthrw(mutex_unlock);
__gthrw(mutex_lock)
__gthrw(mutex_trylock)
__gthrw(mutex_unlock)
#ifdef _LIBOBJC
__gthrw(thr_exit);
__gthrw(thr_keycreate);
__gthrw(thr_getprio);
__gthrw(thr_self);
__gthrw(thr_setprio);
__gthrw(thr_yield);
__gthrw(thr_exit)
__gthrw(thr_keycreate)
__gthrw(thr_getprio)
__gthrw(thr_self)
__gthrw(thr_setprio)
__gthrw(thr_yield)
__gthrw(cond_init);
__gthrw(cond_destroy);
__gthrw(cond_wait);
__gthrw(cond_broadcast);
__gthrw(cond_signal);
__gthrw(cond_init)
__gthrw(cond_destroy)
__gthrw(cond_wait)
__gthrw(cond_broadcast)
__gthrw(cond_signal)
__gthrw(mutex_init);
__gthrw(mutex_destroy);
__gthrw(mutex_init)
__gthrw(mutex_destroy)
#endif
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
@ -102,7 +100,7 @@ __gthrw(mutex_destroy);
static inline int
__gthread_active_p (void)
{
static void *const __gthread_active_ptr = (void *) &__gthrw_thr_create;
static void *const __gthread_active_ptr = (void *) &__gthrw_(thr_create);
return __gthread_active_ptr != 0;
}
@ -132,7 +130,7 @@ __gthread_objc_init_thread_system (void)
{
/* Initialize the thread storage key. */
if (__gthread_active_p ()
&& __gthrw_thr_keycreate (&_objc_thread_storage, NULL) == 0)
&& __gthrw_(thr_keycreate) (&_objc_thread_storage, NULL) == 0)
return 0;
return -1;
@ -160,7 +158,7 @@ __gthread_objc_thread_detach (void (*func)(void *), void *arg)
if (!__gthread_active_p ())
return NULL;
if (__gthrw_thr_create (NULL, 0, (void *) func, arg,
if (__gthrw_(thr_create) (NULL, 0, (void *) func, arg,
THR_DETACHED | THR_NEW_LWP,
&new_thread_id) == 0)
thread_id = *(objc_thread_t *) &new_thread_id;
@ -194,7 +192,7 @@ __gthread_objc_thread_set_priority (int priority)
}
/* Change priority */
if (__gthrw_thr_setprio (__gthrw_thr_self (), sys_priority) == 0)
if (__gthrw_(thr_setprio) (__gthrw_(thr_self) (), sys_priority) == 0)
return 0;
else
return -1;
@ -209,7 +207,7 @@ __gthread_objc_thread_get_priority (void)
if (!__gthread_active_p ())
return OBJC_THREAD_INTERACTIVE_PRIORITY;
if (__gthrw_thr_getprio (__gthrw_thr_self (), &sys_priority) == 0)
if (__gthrw_(thr_getprio) (__gthrw_(thr_self) (), &sys_priority) == 0)
{
if (sys_priority >= 250)
return OBJC_THREAD_INTERACTIVE_PRIORITY;
@ -227,7 +225,7 @@ static inline void
__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
__gthrw_thr_yield ();
__gthrw_(thr_yield) ();
}
/* Terminate the current thread. */
@ -236,7 +234,7 @@ __gthread_objc_thread_exit (void)
{
if (__gthread_active_p ())
/* exit the thread */
__gthrw_thr_exit (&__objc_thread_exit_status);
__gthrw_(thr_exit) (&__objc_thread_exit_status);
/* Failed if we reached here */
return -1;
@ -247,7 +245,7 @@ static inline objc_thread_t
__gthread_objc_thread_id (void)
{
if (__gthread_active_p ())
return (objc_thread_t) __gthrw_thr_self ();
return (objc_thread_t) __gthrw_(thr_self) ();
else
return (objc_thread_t) 1;
}
@ -258,7 +256,7 @@ __gthread_objc_thread_set_data (void *value)
{
if (__gthread_active_p ())
{
if (__gthrw_thr_setspecific (_objc_thread_storage, value) == 0)
if (__gthrw_(thr_setspecific) (_objc_thread_storage, value) == 0)
return 0;
else
return -1;
@ -278,7 +276,7 @@ __gthread_objc_thread_get_data (void)
if (__gthread_active_p ())
{
if (__gthrw_thr_getspecific (_objc_thread_storage, &value) == 0)
if (__gthrw_(thr_getspecific) (_objc_thread_storage, &value) == 0)
return value;
else
return NULL;
@ -294,7 +292,7 @@ static inline int
__gthread_objc_mutex_allocate (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_mutex_init ((mutex_t *) (&(mutex->backend)), USYNC_THREAD, 0))
&& __gthrw_(mutex_init) ((mutex_t *) (&(mutex->backend)), USYNC_THREAD, 0))
return -1;
return 0;
@ -305,7 +303,7 @@ static inline int
__gthread_objc_mutex_deallocate (objc_mutex_t mutex)
{
if (__gthread_active_p ())
__gthrw_mutex_destroy ((mutex_t *) (&(mutex->backend)));
__gthrw_(mutex_destroy) ((mutex_t *) (&(mutex->backend)));
return 0;
}
@ -315,7 +313,7 @@ static inline int
__gthread_objc_mutex_lock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_mutex_lock ((mutex_t *) (&(mutex->backend))) != 0)
&& __gthrw_(mutex_lock) ((mutex_t *) (&(mutex->backend))) != 0)
return -1;
return 0;
@ -326,7 +324,7 @@ static inline int
__gthread_objc_mutex_trylock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_mutex_trylock ((mutex_t *) (&(mutex->backend))) != 0)
&& __gthrw_(mutex_trylock) ((mutex_t *) (&(mutex->backend))) != 0)
return -1;
return 0;
@ -337,7 +335,7 @@ static inline int
__gthread_objc_mutex_unlock (objc_mutex_t mutex)
{
if (__gthread_active_p ()
&& __gthrw_mutex_unlock ((mutex_t *) (&(mutex->backend))) != 0)
&& __gthrw_(mutex_unlock) ((mutex_t *) (&(mutex->backend))) != 0)
return -1;
return 0;
@ -350,7 +348,7 @@ static inline int
__gthread_objc_condition_allocate (objc_condition_t condition)
{
if (__gthread_active_p ())
return __gthrw_cond_init ((cond_t *) (&(condition->backend)), USYNC_THREAD,
return __gthrw_(cond_init) ((cond_t *) (&(condition->backend)), USYNC_THREAD,
NULL);
else
return 0;
@ -361,7 +359,7 @@ static inline int
__gthread_objc_condition_deallocate (objc_condition_t condition)
{
if (__gthread_active_p ())
return __gthrw_cond_destroy ((cond_t *) (&(condition->backend)));
return __gthrw_(cond_destroy) ((cond_t *) (&(condition->backend)));
else
return 0;
}
@ -371,7 +369,7 @@ static inline int
__gthread_objc_condition_wait (objc_condition_t condition, objc_mutex_t mutex)
{
if (__gthread_active_p ())
return __gthrw_cond_wait ((cond_t *) (&(condition->backend)),
return __gthrw_(cond_wait) ((cond_t *) (&(condition->backend)),
(mutex_t *) (&(mutex->backend)));
else
return 0;
@ -382,7 +380,7 @@ static inline int
__gthread_objc_condition_broadcast (objc_condition_t condition)
{
if (__gthread_active_p ())
return __gthrw_cond_broadcast ((cond_t *) (&(condition->backend)));
return __gthrw_(cond_broadcast) ((cond_t *) (&(condition->backend)));
else
return 0;
}
@ -392,7 +390,7 @@ static inline int
__gthread_objc_condition_signal (objc_condition_t condition)
{
if (__gthread_active_p ())
return __gthrw_cond_signal ((cond_t *) (&(condition->backend)));
return __gthrw_(cond_signal) ((cond_t *) (&(condition->backend)));
else
return 0;
}
@ -410,7 +408,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
if (once->once == 0)
{
int status = __gthrw_mutex_lock (&once->mutex);
int status = __gthrw_(mutex_lock) (&once->mutex);
if (status != 0)
return status;
if (once->once == 0)
@ -418,7 +416,7 @@ __gthread_once (__gthread_once_t *once, void (*func) (void))
(*func) ();
once->once++;
}
__gthrw_mutex_unlock (&once->mutex);
__gthrw_(mutex_unlock) (&once->mutex);
}
return 0;
}
@ -429,7 +427,7 @@ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
/* Solaris 2.5 contains thr_* routines no-op in libc, so test if we actually
got a reasonable key value, and if not, fail. */
*key = (__gthread_key_t)-1;
if (__gthrw_thr_keycreate (key, dtor) != 0 || *key == (__gthread_key_t)-1)
if (__gthrw_(thr_keycreate) (key, dtor) != 0 || *key == (__gthread_key_t)-1)
return -1;
else
return 0;
@ -446,7 +444,7 @@ static inline void *
__gthread_getspecific (__gthread_key_t key)
{
void *ptr;
if (__gthrw_thr_getspecific (key, &ptr) == 0)
if (__gthrw_(thr_getspecific) (key, &ptr) == 0)
return ptr;
else
return 0;
@ -455,14 +453,14 @@ __gthread_getspecific (__gthread_key_t key)
static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr)
{
return __gthrw_thr_setspecific (key, (void *) ptr);
return __gthrw_(thr_setspecific) (key, (void *) ptr);
}
static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_mutex_lock (mutex);
return __gthrw_(mutex_lock) (mutex);
else
return 0;
}
@ -471,7 +469,7 @@ static inline int
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_mutex_trylock (mutex);
return __gthrw_(mutex_trylock) (mutex);
else
return 0;
}
@ -480,7 +478,7 @@ static inline int
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__gthread_active_p ())
return __gthrw_mutex_unlock (mutex);
return __gthrw_(mutex_unlock) (mutex);
else
return 0;
}
@ -490,7 +488,7 @@ __gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
{
mutex->depth = 0;
mutex->owner = (thread_t) 0;
return __gthrw_mutex_init (&mutex->actual, USYNC_THREAD, 0);
return __gthrw_(mutex_init) (&mutex->actual, USYNC_THREAD, 0);
}
static inline int
@ -498,11 +496,11 @@ __gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
{
if (__gthread_active_p ())
{
thread_t me = __gthrw_thr_self ();
thread_t me = __gthrw_(thr_self) ();
if (mutex->owner != me)
{
__gthrw_mutex_lock (&mutex->actual);
__gthrw_(mutex_lock) (&mutex->actual);
mutex->owner = me;
}
@ -516,11 +514,11 @@ __gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
{
if (__gthread_active_p ())
{
thread_t me = __gthrw_thr_self ();
thread_t me = __gthrw_(thr_self) ();
if (mutex->owner != me)
{
if (__gthrw_mutex_trylock (&mutex->actual))
if (__gthrw_(mutex_trylock) (&mutex->actual))
return 1;
mutex->owner = me;
}
@ -538,7 +536,7 @@ __gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
if (--mutex->depth == 0)
{
mutex->owner = (thread_t) 0;
__gthrw_mutex_unlock (&mutex->actual);
__gthrw_(mutex_unlock) (&mutex->actual);
}
}
return 0;

44
gcc/gthr-tpf.h
View file

@ -70,25 +70,23 @@ typedef pthread_mutex_t __gthread_recursive_mutex_t;
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
# define __gthrw(name) \
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)))
static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
# define __gthrw_(name) __gthrw_ ## name
#else
# define __gthrw_asmname(cname) __gthrw_asmnamep (__USER_LABEL_PREFIX__, cname)
# define __gthrw_asmnamep(prefix, cname) __gthrw_string (prefix) cname
# define __gthrw_string(x) #x
# define __gthrw(name) \
extern __typeof(name) __gthrw_ ## name __asm (__gthrw_asmname (#name))
# define __gthrw(name)
# define __gthrw_(name) name
#endif
__gthrw(pthread_once);
__gthrw(pthread_key_create);
__gthrw(pthread_key_delete);
__gthrw(pthread_getspecific);
__gthrw(pthread_setspecific);
__gthrw(pthread_create);
__gthrw(pthread_once)
__gthrw(pthread_key_create)
__gthrw(pthread_key_delete)
__gthrw(pthread_getspecific)
__gthrw(pthread_setspecific)
__gthrw(pthread_create)
__gthrw(pthread_mutex_lock);
__gthrw(pthread_mutex_trylock);
__gthrw(pthread_mutex_unlock);
__gthrw(pthread_mutex_lock)
__gthrw(pthread_mutex_trylock)
__gthrw(pthread_mutex_unlock)
static inline int
__gthread_active_p (void)
@ -100,7 +98,7 @@ static inline int
__gthread_once (__gthread_once_t *once, void (*func) (void))
{
if (__tpf_pthread_active ())
return __gthrw_pthread_once (once, func);
return __gthrw_(pthread_once) (once, func);
else
return -1;
}
@ -109,7 +107,7 @@ static inline int
__gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
{
if (__tpf_pthread_active ())
return __gthrw_pthread_key_create (key, dtor);
return __gthrw_(pthread_key_create) (key, dtor);
else
return -1;
}
@ -118,7 +116,7 @@ static inline int
__gthread_key_delete (__gthread_key_t key)
{
if (__tpf_pthread_active ())
return __gthrw_pthread_key_delete (key);
return __gthrw_(pthread_key_delete) (key);
else
return -1;
}
@ -127,7 +125,7 @@ static inline void *
__gthread_getspecific (__gthread_key_t key)
{
if (__tpf_pthread_active ())
return __gthrw_pthread_getspecific (key);
return __gthrw_(pthread_getspecific) (key);
else
return NULL;
}
@ -136,7 +134,7 @@ static inline int
__gthread_setspecific (__gthread_key_t key, const void *ptr)
{
if (__tpf_pthread_active ())
return __gthrw_pthread_setspecific (key, ptr);
return __gthrw_(pthread_setspecific) (key, ptr);
else
return -1;
}
@ -145,7 +143,7 @@ static inline int
__gthread_mutex_lock (__gthread_mutex_t *mutex)
{
if (__tpf_pthread_active ())
return __gthrw_pthread_mutex_lock (mutex);
return __gthrw_(pthread_mutex_lock) (mutex);
else
return 0;
}
@ -154,7 +152,7 @@ static inline int
__gthread_mutex_trylock (__gthread_mutex_t *mutex)
{
if (__tpf_pthread_active ())
return __gthrw_pthread_mutex_trylock (mutex);
return __gthrw_(pthread_mutex_trylock) (mutex);
else
return 0;
}
@ -163,7 +161,7 @@ static inline int
__gthread_mutex_unlock (__gthread_mutex_t *mutex)
{
if (__tpf_pthread_active ())
return __gthrw_pthread_mutex_unlock (mutex);
return __gthrw_(pthread_mutex_unlock) (mutex);
else
return 0;
}