X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgthr-posix.h;h=e2b5a5739990ccc6cb2fc1569088b87702170230;hb=9a5e8086de4743586d52ab102990455554db39db;hp=b5a4637f592e216ad3da944f788297036da0419d;hpb=88025ea7075bae6ff88b8894f8aef77a22b46786;p=pf3gnuchains%2Fgcc-fork.git diff --git a/gcc/gthr-posix.h b/gcc/gthr-posix.h index b5a4637f592..e2b5a573999 100644 --- a/gcc/gthr-posix.h +++ b/gcc/gthr-posix.h @@ -1,23 +1,24 @@ /* Threads compatibility routines for libgcc2 and libobjc. */ /* Compile this one with gcc. */ -/* Copyright (C) 1997, 1999, 2000 Free Software Foundation, Inc. +/* Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003 + Free Software Foundation, Inc. -This file is part of GNU CC. +This file is part of GCC. -GNU CC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. +GCC is free software; you can redistribute it and/or modify it under +the terms of the GNU General Public License as published by the Free +Software Foundation; either version 2, or (at your option) any later +version. -GNU CC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. +GCC is distributed in the hope that it will be useful, but WITHOUT ANY +WARRANTY; without even the implied warranty of MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License +for more details. You should have received a copy of the GNU General Public License -along with GNU CC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ +along with GCC; see the file COPYING. If not, write to the Free +Software Foundation, 59 Temple Place - Suite 330, Boston, MA +02111-1307, USA. */ /* As a special exception, if you link this library with other files, some of which are compiled with GCC, to produce an executable, @@ -30,11 +31,17 @@ Boston, MA 02111-1307, USA. */ #define GCC_GTHR_POSIX_H /* POSIX threads specific definitions. - Easy, since the interface is just one-to-one mapping. */ + Easy, since the interface is just one-to-one mapping. */ #define __GTHREADS 1 +/* Some implementations of require this to be defined. */ +#ifndef _REENTRANT +#define _REENTRANT 1 +#endif + #include +#include typedef pthread_key_t __gthread_key_t; typedef pthread_once_t __gthread_once_t; @@ -52,12 +59,12 @@ typedef pthread_mutex_t __gthread_mutex_t; #pragma weak pthread_setspecific #pragma weak pthread_create -#pragma weak pthread_mutex_lock -#pragma weak pthread_mutex_trylock -#pragma weak pthread_mutex_unlock +#pragma weak pthread_mutex_lock +#pragma weak pthread_mutex_trylock +#pragma weak pthread_mutex_unlock -#ifdef _LIBOBJC -/* Objective C. */ +#if defined(_LIBOBJC) || defined(_LIBOBJC_WEAK) +/* Objective-C. */ #pragma weak pthread_cond_broadcast #pragma weak pthread_cond_destroy #pragma weak pthread_cond_init @@ -67,19 +74,26 @@ typedef pthread_mutex_t __gthread_mutex_t; #pragma weak pthread_mutex_init #pragma weak pthread_mutex_destroy #pragma weak pthread_self +#ifdef _POSIX_PRIORITY_SCHEDULING +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING +#pragma weak sched_get_priority_max +#pragma weak sched_get_priority_min +#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ +#endif /* _POSIX_PRIORITY_SCHEDULING */ #pragma weak sched_yield #pragma weak pthread_attr_destroy #pragma weak pthread_attr_init #pragma weak pthread_attr_setdetachstate +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING #pragma weak pthread_getschedparam #pragma weak pthread_setschedparam -#endif - -static void *__gthread_active_ptr = (void *) &pthread_create; +#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ +#endif /* _LIBOBJC || _LIBOBJC_WEAK */ static inline int __gthread_active_p (void) { + static void *const __gthread_active_ptr = (void *) &pthread_create; return __gthread_active_ptr != 0; } @@ -111,35 +125,35 @@ static void *thread_local_storage = NULL; /* Backend initialization functions */ -/* Initialize the threads subsystem. */ +/* Initialize the threads subsystem. */ static inline int -__gthread_objc_init_thread_system(void) +__gthread_objc_init_thread_system (void) { if (__gthread_active_p ()) { /* Initialize the thread storage key */ - if (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 (pthread_attr_init(&_objc_thread_attribs) == 0 - && pthread_attr_setdetachstate(&_objc_thread_attribs, - PTHREAD_CREATE_DETACHED) == 0) - return 0; - } + if (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 (pthread_attr_init (&_objc_thread_attribs) == 0 + && pthread_attr_setdetachstate (&_objc_thread_attribs, + PTHREAD_CREATE_DETACHED) == 0) + return 0; + } } - else - return -1; + + return -1; } -/* Close the threads subsystem. */ +/* Close the threads subsystem. */ static inline int -__gthread_objc_close_thread_system(void) +__gthread_objc_close_thread_system (void) { if (__gthread_active_p () - && pthread_key_delete(_objc_thread_storage) == 0 - && pthread_attr_destroy(&_objc_thread_attribs) == 0) + && pthread_key_delete (_objc_thread_storage) == 0 + && pthread_attr_destroy (&_objc_thread_attribs) == 0) return 0; return -1; @@ -147,120 +161,125 @@ __gthread_objc_close_thread_system(void) /* Backend thread functions */ -/* Create a new thread of execution. */ +/* Create a new thread of execution. */ static inline objc_thread_t -__gthread_objc_thread_detach(void (*func)(void *), void *arg) +__gthread_objc_thread_detach (void (*func)(void *), void *arg) { objc_thread_t thread_id; pthread_t new_thread_handle; if (!__gthread_active_p ()) return NULL; - - if ( !(pthread_create(&new_thread_handle, NULL, (void *)func, arg)) ) - thread_id = *(objc_thread_t *)&new_thread_handle; + + if (!(pthread_create (&new_thread_handle, NULL, (void *) func, arg))) + thread_id = (objc_thread_t) new_thread_handle; else thread_id = NULL; - + return thread_id; } -/* Set the current thread's priority. */ +/* Set the current thread's priority. */ static inline int -__gthread_objc_thread_set_priority(int priority) +__gthread_objc_thread_set_priority (int priority) { - if (!__gthread_active_p()) - return -1; - else { - pthread_t thread_id = pthread_self(); - int policy; - struct sched_param params; - int priority_min, priority_max; - - if (pthread_getschedparam(thread_id, &policy, ¶ms) == 0) - { - if ((priority_max = sched_get_priority_max(policy)) != 0) - return -1; - - if ((priority_min = sched_get_priority_min(policy)) != 0) - return -1; - - if (priority > priority_max) - priority = priority_max; - else if (priority < priority_min) - priority = priority_min; - params.sched_priority = priority; - - /* - * The solaris 7 and several other man pages incorrectly state that - * this should be a pointer to policy but pthread.h is universally - * at odds with this. - */ - if (pthread_setschedparam(thread_id, policy, ¶ms) == 0) - return 0; - } + if (!__gthread_active_p ()) return -1; - } + else + { +#ifdef _POSIX_PRIORITY_SCHEDULING +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING + pthread_t thread_id = pthread_self (); + int policy; + struct sched_param params; + int priority_min, priority_max; + + if (pthread_getschedparam (thread_id, &policy, ¶ms) == 0) + { + if ((priority_max = sched_get_priority_max (policy)) == -1) + return -1; + + if ((priority_min = sched_get_priority_min (policy)) == -1) + return -1; + + if (priority > priority_max) + priority = priority_max; + else if (priority < priority_min) + priority = priority_min; + params.sched_priority = priority; + + /* + * The solaris 7 and several other man pages incorrectly state that + * this should be a pointer to policy but pthread.h is universally + * at odds with this. + */ + if (pthread_setschedparam (thread_id, policy, ¶ms) == 0) + return 0; + } +#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ +#endif /* _POSIX_PRIORITY_SCHEDULING */ + return -1; + } } -/* Return the current thread's priority. */ +/* Return the current thread's priority. */ static inline int -__gthread_objc_thread_get_priority(void) +__gthread_objc_thread_get_priority (void) { +#ifdef _POSIX_PRIORITY_SCHEDULING +#ifdef _POSIX_THREAD_PRIORITY_SCHEDULING if (__gthread_active_p ()) { int policy; struct sched_param params; - if (pthread_getschedparam(pthread_self(), &policy, ¶ms) == 0) - return params.sched_priority; + if (pthread_getschedparam (pthread_self (), &policy, ¶ms) == 0) + return params.sched_priority; else - return -1; + return -1; } else +#endif /* _POSIX_THREAD_PRIORITY_SCHEDULING */ +#endif /* _POSIX_PRIORITY_SCHEDULING */ return OBJC_THREAD_INTERACTIVE_PRIORITY; } -/* Yield our process time to another thread. */ +/* Yield our process time to another thread. */ static inline void -__gthread_objc_thread_yield(void) +__gthread_objc_thread_yield (void) { if (__gthread_active_p ()) - sched_yield(); + sched_yield (); } -/* Terminate the current thread. */ +/* Terminate the current thread. */ static inline int -__gthread_objc_thread_exit(void) +__gthread_objc_thread_exit (void) { if (__gthread_active_p ()) /* exit the thread */ - pthread_exit(&__objc_thread_exit_status); + pthread_exit (&__objc_thread_exit_status); /* Failed if we reached here */ return -1; } -/* Returns an integer value which uniquely describes a thread. */ +/* Returns an integer value which uniquely describes a thread. */ static inline objc_thread_t -__gthread_objc_thread_id(void) +__gthread_objc_thread_id (void) { if (__gthread_active_p ()) - { - pthread_t self = pthread_self(); - - return *(objc_thread_t *)&self; - } + return (objc_thread_t) pthread_self (); else - return (objc_thread_t)1; + return (objc_thread_t) 1; } -/* Sets the thread's local storage pointer. */ +/* Sets the thread's local storage pointer. */ static inline int -__gthread_objc_thread_set_data(void *value) +__gthread_objc_thread_set_data (void *value) { if (__gthread_active_p ()) - return pthread_setspecific(_objc_thread_storage, value); + return pthread_setspecific (_objc_thread_storage, value); else { thread_local_storage = value; @@ -268,29 +287,29 @@ __gthread_objc_thread_set_data(void *value) } } -/* Returns the thread's local storage pointer. */ +/* Returns the thread's local storage pointer. */ static inline void * -__gthread_objc_thread_get_data(void) +__gthread_objc_thread_get_data (void) { if (__gthread_active_p ()) - return pthread_getspecific(_objc_thread_storage); + return pthread_getspecific (_objc_thread_storage); else return thread_local_storage; } /* Backend mutex functions */ -/* Allocate a mutex. */ +/* Allocate a mutex. */ static inline int -__gthread_objc_mutex_allocate(objc_mutex_t mutex) +__gthread_objc_mutex_allocate (objc_mutex_t mutex) { if (__gthread_active_p ()) { - mutex->backend = objc_malloc(sizeof(pthread_mutex_t)); + mutex->backend = objc_malloc (sizeof (pthread_mutex_t)); - if (pthread_mutex_init((pthread_mutex_t *)mutex->backend, NULL)) + if (pthread_mutex_init ((pthread_mutex_t *) mutex->backend, NULL)) { - objc_free(mutex->backend); + objc_free (mutex->backend); mutex->backend = NULL; return -1; } @@ -299,9 +318,9 @@ __gthread_objc_mutex_allocate(objc_mutex_t mutex) return 0; } -/* Deallocate a mutex. */ +/* Deallocate a mutex. */ static inline int -__gthread_objc_mutex_deallocate(objc_mutex_t mutex) +__gthread_objc_mutex_deallocate (objc_mutex_t mutex) { if (__gthread_active_p ()) { @@ -314,64 +333,73 @@ __gthread_objc_mutex_deallocate(objc_mutex_t mutex) do { - count = pthread_mutex_unlock((pthread_mutex_t *)mutex->backend); + count = pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend); if (count < 0) return -1; } while (count); - if (pthread_mutex_destroy((pthread_mutex_t *)mutex->backend)) + if (pthread_mutex_destroy ((pthread_mutex_t *) mutex->backend)) return -1; - objc_free(mutex->backend); + objc_free (mutex->backend); mutex->backend = NULL; } return 0; } -/* Grab a lock on a mutex. */ +/* Grab a lock on a mutex. */ static inline int -__gthread_objc_mutex_lock(objc_mutex_t mutex) +__gthread_objc_mutex_lock (objc_mutex_t mutex) { - if (__gthread_active_p ()) - return pthread_mutex_lock((pthread_mutex_t *)mutex->backend); - else - return 0; + if (__gthread_active_p () + && pthread_mutex_lock ((pthread_mutex_t *) mutex->backend) != 0) + { + return -1; + } + + return 0; } -/* Try to grab a lock on a mutex. */ +/* Try to grab a lock on a mutex. */ static inline int -__gthread_objc_mutex_trylock(objc_mutex_t mutex) +__gthread_objc_mutex_trylock (objc_mutex_t mutex) { - if (__gthread_active_p ()) - return pthread_mutex_trylock((pthread_mutex_t *)mutex->backend); - else - return 0; + if (__gthread_active_p () + && pthread_mutex_trylock ((pthread_mutex_t *) mutex->backend) != 0) + { + return -1; + } + + return 0; } /* Unlock the mutex */ static inline int -__gthread_objc_mutex_unlock(objc_mutex_t mutex) +__gthread_objc_mutex_unlock (objc_mutex_t mutex) { - if (__gthread_active_p ()) - return pthread_mutex_unlock((pthread_mutex_t *)mutex->backend); - else - return 0; + if (__gthread_active_p () + && pthread_mutex_unlock ((pthread_mutex_t *) mutex->backend) != 0) + { + return -1; + } + + return 0; } /* Backend condition mutex functions */ -/* Allocate a condition. */ +/* Allocate a condition. */ static inline int -__gthread_objc_condition_allocate(objc_condition_t condition) +__gthread_objc_condition_allocate (objc_condition_t condition) { if (__gthread_active_p ()) { - condition->backend = objc_malloc(sizeof(pthread_cond_t)); + condition->backend = objc_malloc (sizeof (pthread_cond_t)); - if (pthread_cond_init((pthread_cond_t *)condition->backend, NULL)) + if (pthread_cond_init ((pthread_cond_t *) condition->backend, NULL)) { - objc_free(condition->backend); + objc_free (condition->backend); condition->backend = NULL; return -1; } @@ -380,16 +408,16 @@ __gthread_objc_condition_allocate(objc_condition_t condition) return 0; } -/* Deallocate a condition. */ +/* Deallocate a condition. */ static inline int -__gthread_objc_condition_deallocate(objc_condition_t condition) +__gthread_objc_condition_deallocate (objc_condition_t condition) { if (__gthread_active_p ()) { - if (pthread_cond_destroy((pthread_cond_t *)condition->backend)) + if (pthread_cond_destroy ((pthread_cond_t *) condition->backend)) return -1; - objc_free(condition->backend); + objc_free (condition->backend); condition->backend = NULL; } return 0; @@ -397,31 +425,31 @@ __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, objc_mutex_t mutex) { if (__gthread_active_p ()) - return pthread_cond_wait((pthread_cond_t *)condition->backend, - (pthread_mutex_t *)mutex->backend); + return pthread_cond_wait ((pthread_cond_t *) condition->backend, + (pthread_mutex_t *) mutex->backend); else return 0; } -/* Wake up all threads waiting on this condition. */ +/* 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) { if (__gthread_active_p ()) - return pthread_cond_broadcast((pthread_cond_t *)condition->backend); + return pthread_cond_broadcast ((pthread_cond_t *) condition->backend); else return 0; } -/* Wake up one thread waiting on this 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) { if (__gthread_active_p ()) - return pthread_cond_signal((pthread_cond_t *)condition->backend); + return pthread_cond_signal ((pthread_cond_t *) condition->backend); else return 0; } @@ -444,16 +472,6 @@ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *)) } static inline int -__gthread_key_dtor (__gthread_key_t key, void *ptr) -{ - /* Just reset the key value to zero. */ - if (ptr) - return pthread_setspecific (key, 0); - else - return 0; -} - -static inline int __gthread_key_delete (__gthread_key_t key) { return pthread_key_delete (key);