/* 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, 2004 Free Software Foundation, Inc.
This file is part of GCC.
You should have received a copy of the GNU General Public License
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. */
+Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA. */
/* As a special exception, if you link this library with other files,
some of which are compiled with GCC, to produce an executable,
#include <errno.h>
typedef thread_key_t __gthread_key_t;
-typedef struct
-{
+typedef struct {
mutex_t mutex;
int once;
} __gthread_once_t;
typedef mutex_t __gthread_mutex_t;
+typedef struct {
+ long depth;
+ thread_t owner;
+ mutex_t actual;
+} __gthread_recursive_mutex_t;
+
#define __GTHREAD_ONCE_INIT { DEFAULTMUTEX, 0 }
#define __GTHREAD_MUTEX_INIT DEFAULTMUTEX
+#define __GTHREAD_RECURSIVE_MUTEX_INIT_FUNCTION __gthread_recursive_mutex_init_function
#if SUPPORTS_WEAK && GTHREAD_USE_WEAK
/* This will not actually work in Solaris 2.5, since libc contains
dummy symbols of all thr_* routines. */
-static void *__gthread_active_ptr = (void *) &thr_create;
-
static inline int
__gthread_active_p (void)
{
+ static void *const __gthread_active_ptr = (void *) &thr_create;
return __gthread_active_ptr != 0;
}
/* Initialize the threads subsystem. */
static inline int
-__gthread_objc_init_thread_system(void)
+__gthread_objc_init_thread_system (void)
{
- /* Initialize the thread storage key */
+ /* Initialize the thread storage key. */
if (__gthread_active_p ()
- && thr_keycreate(&_objc_thread_storage, NULL) == 0)
+ && thr_keycreate (&_objc_thread_storage, NULL) == 0)
return 0;
return -1;
/* Close the threads subsystem. */
static inline int
-__gthread_objc_close_thread_system(void)
+__gthread_objc_close_thread_system (void)
{
if (__gthread_active_p ())
return 0;
/* 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;
thread_t new_thread_id = 0;
if (!__gthread_active_p ())
return NULL;
-
- if (thr_create(NULL, 0, (void *)func, arg,
- THR_DETACHED | THR_NEW_LWP,
- &new_thread_id) == 0)
- thread_id = *(objc_thread_t *)&new_thread_id;
+
+ if (thr_create (NULL, 0, (void *) func, arg,
+ THR_DETACHED | THR_NEW_LWP,
+ &new_thread_id) == 0)
+ thread_id = *(objc_thread_t *) &new_thread_id;
else
thread_id = NULL;
-
+
return thread_id;
}
/* Set the current thread's priority. */
static inline int
-__gthread_objc_thread_set_priority(int priority)
+__gthread_objc_thread_set_priority (int priority)
{
int sys_priority = 0;
}
/* Change priority */
- if (thr_setprio(thr_self(), sys_priority) == 0)
+ if (thr_setprio (thr_self (), sys_priority) == 0)
return 0;
else
return -1;
/* Return the current thread's priority. */
static inline int
-__gthread_objc_thread_get_priority(void)
+__gthread_objc_thread_get_priority (void)
{
int sys_priority;
if (!__gthread_active_p ())
return OBJC_THREAD_INTERACTIVE_PRIORITY;
-
- if (thr_getprio(thr_self(), &sys_priority) == 0)
+
+ if (thr_getprio (thr_self (), &sys_priority) == 0)
{
if (sys_priority >= 250)
return OBJC_THREAD_INTERACTIVE_PRIORITY;
/* Yield our process time to another thread. */
static inline void
-__gthread_objc_thread_yield(void)
+__gthread_objc_thread_yield (void)
{
if (__gthread_active_p ())
- thr_yield();
+ thr_yield ();
}
/* Terminate the current thread. */
static inline int
-__gthread_objc_thread_exit(void)
+__gthread_objc_thread_exit (void)
{
if (__gthread_active_p ())
/* exit the thread */
- thr_exit(&__objc_thread_exit_status);
+ thr_exit (&__objc_thread_exit_status);
/* Failed if we reached here */
return -1;
/* 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 ())
- return (objc_thread_t)thr_self();
+ return (objc_thread_t) thr_self ();
else
- return (objc_thread_t)1;
+ return (objc_thread_t) 1;
}
/* 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 ())
{
- if (thr_setspecific(_objc_thread_storage, value) == 0)
+ if (thr_setspecific (_objc_thread_storage, value) == 0)
return 0;
else
return -1;
/* Returns the thread's local storage pointer. */
static inline void *
-__gthread_objc_thread_get_data(void)
+__gthread_objc_thread_get_data (void)
{
void *value = NULL;
if (__gthread_active_p ())
{
- if (thr_getspecific(_objc_thread_storage, &value) == 0)
+ if (thr_getspecific (_objc_thread_storage, &value) == 0)
return value;
else
return NULL;
/* 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_init( (mutex_t *)(&(mutex->backend)), USYNC_THREAD, 0))
+ && mutex_init ((mutex_t *) (&(mutex->backend)), USYNC_THREAD, 0))
return -1;
return 0;
/* 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 ())
- mutex_destroy((mutex_t *)(&(mutex->backend)));
+ mutex_destroy ((mutex_t *) (&(mutex->backend)));
return 0;
}
/* 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 ()
- && mutex_lock((mutex_t *)(&(mutex->backend))) != 0)
+ && mutex_lock ((mutex_t *) (&(mutex->backend))) != 0)
return -1;
return 0;
/* 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 ()
- && mutex_trylock((mutex_t *)(&(mutex->backend))) != 0)
+ && mutex_trylock ((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 ()
- && mutex_unlock((mutex_t *)(&(mutex->backend))) != 0)
+ && mutex_unlock ((mutex_t *) (&(mutex->backend))) != 0)
return -1;
return 0;
/* 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 ())
- return cond_init((cond_t *)(&(condition->backend)), USYNC_THREAD,
- NULL);
+ return cond_init ((cond_t *) (&(condition->backend)), USYNC_THREAD,
+ NULL);
else
return 0;
}
/* 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 ())
- return cond_destroy((cond_t *)(&(condition->backend)));
+ return cond_destroy ((cond_t *) (&(condition->backend)));
else
return 0;
}
/* 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 cond_wait((cond_t *)(&(condition->backend)),
- (mutex_t *)(&(mutex->backend)));
+ return cond_wait ((cond_t *) (&(condition->backend)),
+ (mutex_t *) (&(mutex->backend)));
else
return 0;
}
/* 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 cond_broadcast((cond_t *)(&(condition->backend)));
+ return cond_broadcast ((cond_t *) (&(condition->backend)));
else
return 0;
}
/* 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 cond_signal((cond_t *)(&(condition->backend)));
+ return cond_signal ((cond_t *) (&(condition->backend)));
else
return 0;
}
if (once->once == 0)
{
(*func) ();
- once->once ++;
+ once->once++;
}
mutex_unlock (&once->mutex);
}
{
/* 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 = -1;
- if (thr_keycreate (key, dtor) != 0 || *key == -1)
+ *key = (__gthread_key_t)-1;
+ if (thr_keycreate (key, dtor) != 0 || *key == (__gthread_key_t)-1)
return -1;
else
return 0;
}
static inline int
-__gthread_key_dtor (__gthread_key_t key, void *ptr)
-{
- /* Nothing needed. */
- return 0;
-}
-
-static inline int
__gthread_key_delete (__gthread_key_t key)
{
/* Not possible. */
return 0;
}
+static inline int
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
+{
+ mutex->depth = 0;
+ mutex->owner = (thread_t) 0;
+ return mutex_init (&mutex->actual, USYNC_THREAD, 0);
+}
+
+static inline int
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
+{
+ if (__gthread_active_p ())
+ {
+ thread_t me = thr_self ();
+
+ if (mutex->owner != me)
+ {
+ mutex_lock (&mutex->actual);
+ mutex->owner = me;
+ }
+
+ mutex->depth++;
+ }
+ return 0;
+}
+
+static inline int
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
+{
+ if (__gthread_active_p ())
+ {
+ thread_t me = thr_self ();
+
+ if (mutex->owner != me)
+ {
+ if (mutex_trylock (&mutex->actual))
+ return 1;
+ mutex->owner = me;
+ }
+
+ mutex->depth++;
+ }
+ return 0;
+}
+
+static inline int
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
+{
+ if (__gthread_active_p ())
+ {
+ if (--mutex->depth == 0)
+ {
+ mutex->owner = (thread_t) 0;
+ mutex_unlock (&mutex->actual);
+ }
+ }
+ return 0;
+}
+
#endif /* _LIBOBJC */
#endif /* ! GCC_GTHR_SOLARIS_H */
OSDN Git Service
