Completely rework according to new interface.

From-SVN: r14310

1 files changed, 114 insertions, 226 deletions

diff --git a/gcc/objc/thr-posix.c b/gcc/objc/thr-posix.c
index 987f8a8..1b9a9e5 100644
--- a/gcc/objc/thr-posix.c
+++ b/gcc/objc/thr-posix.c
@@ -29,294 +29,182 @@ Boston, MA 02111-1307, USA.  */
 #include "runtime.h"
 #include <pthread.h>
 
-/********
- *  This structure represents a single mutual exclusion lock.  Lock semantics
- *  are detailed with the subsequent functions.  We use whatever lock is
- *  provided by the system.  We augment it with depth and current owner id
- *  fields to implement and re-entrant lock.
- */
-struct objc_mutex 
-{
-    volatile objc_thread_t     owner;          /* Id of thread that owns.  */
-    volatile int                depth;          /* # of acquires.           */
-    pthread_mutex_t             lock;           /* pthread mutex.           */
-};
-
-/*****************************************************************************
- *  Static variables.
- */
-static pthread_key_t    __objc_thread_data_key; /* Data key for thread data.*/
+/* Key structure for maintiain thread specific storage */
+static pthread_key_t _objc_thread_storage;
 
+/* Backend initialization functions */
 
-/********
- *  Initialize the threads subsystem.  Returns 0 if successful, or -1 if no
- *  thread support is available.
- */
+/* Initialize the threads subsystem. */
 int
 __objc_init_thread_system(void)
 {
-    if (pthread_key_create(&__objc_thread_data_key, NULL) == 0)
-        return 0;                               /* Yes, return success.     */
-    
-    return -1;                                  /* Failed.                  */
+  /* Initialize the thread storage key */
+  return pthread_key_create(&_objc_thread_storage, NULL);
 }
 
+/* Close the threads subsystem. */
 int
-__objc_fini_thread_system(void)
+__objc_close_thread_system(void)
 {
   return 0;
 }
 
-/********
- *  Create a new thread of execution and return its id.  Return NULL if fails.
- *  The new thread starts in "func" with the given argument.
- */
+/* Backend thread functions */
+
+/* Create a new thread of execution. */
 objc_thread_t
-objc_thread_create(void (*func)(void *arg), void *arg)
+__objc_thread_detach(void (*func)(void *arg), void *arg)
 {
-    objc_thread_t      thread_id = NULL;       /* Detached thread id.      */
-    pthread_t           new_thread_handle;      /* DCE thread handle.       */
-
-    objc_mutex_lock(__objc_runtime_mutex);
-
-    if (pthread_create(&new_thread_handle, NULL,
-                       (void *)func, arg) == 0) {
-        thread_id = (objc_thread_t) new_thread_handle;
-        pthread_detach(new_thread_handle);     /* Fully detach thread.     */
-	__objc_runtime_threads_alive++;
-    }
-    
-    objc_mutex_unlock(__objc_runtime_mutex);
-    return thread_id;
+  objc_thread_t thread_id;
+  pthread_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. */
 int
-objc_thread_set_priority(int priority)
+__objc_thread_set_priority(int priority)
 {
-#if 0 /* no get/set priority in Linux pthreads */
-
-    int         sys_priority = 0;
-
-    switch (priority) {
-    case OBJC_THREAD_INTERACTIVE_PRIORITY:
-        sys_priority = (PRI_FG_MIN_NP + PRI_FG_MAX_NP) / 2;
-        break;
-    default:
-    case OBJC_THREAD_BACKGROUND_PRIORITY:
-        sys_priority = (PRI_BG_MIN_NP + PRI_BG_MAX_NP) / 2;
-        break;
-    case OBJC_THREAD_LOW_PRIORITY:
-        sys_priority = (PRI_BG_MIN_NP + PRI_BG_MAX_NP) / 2;
-        break;
-    }
-    
-    if (pthread_setprio(pthread_self(), sys_priority) >= 0)
-        return 0;                               /* Changed priority. End.   */
-    
-#endif
-    return -1;                                  /* Failed.                  */
+  /* Not implemented yet */
+  return -1;
 }
 
-/********
- *  Return the current thread's priority.
- */
+/* Return the current thread's priority. */
 int
-objc_thread_get_priority(void)
+__objc_thread_get_priority(void)
 {
-#if 0 /* no get/set priority in Linux pthreads */
-    int         sys_priority;                   /* DCE thread priority.     */
-    
-    if ((sys_priority = pthread_getprio(pthread_self())) >= 0) {
-        if (sys_priority >= PRI_FG_MIN_NP && sys_priority <= PRI_FG_MAX_NP)
-            return OBJC_THREAD_INTERACTIVE_PRIORITY;
-        if (sys_priority >= PRI_BG_MIN_NP && sys_priority <= PRI_BG_MAX_NP)
-            return OBJC_THREAD_BACKGROUND_PRIORITY;
-        return OBJC_THREAD_LOW_PRIORITY;
-    }
-#endif
-    return -1;                                  /* Couldn't get priority.   */
+  /* Not implemented yet */
+  return -1;
 }
 
-/********
- *  Yield our process time to another thread.  Any BUSY waiting that is done
- *  by a thread should use this function to make sure that other threads can
- *  make progress even on a lazy uniprocessor system.
- */
+/* Yield our process time to another thread. */
 void
-objc_thread_yield(void)
+__objc_thread_yield(void)
 {
-    pthread_yield();                            /* Yield to equal thread.   */
+  pthread_yield();
 }
 
-/********
- *  Terminate the current tread.  Doesn't return anything.  Doesn't return.
- *  Actually, if it failed returns -1.
- */
+/* Terminate the current thread. */
 int
-objc_thread_exit(void)
+__objc_thread_exit(void)
 {
-  objc_mutex_lock(__objc_runtime_mutex);
-  __objc_runtime_threads_alive--;
-  objc_mutex_unlock(__objc_runtime_mutex);
-      
-  pthread_exit(&__objc_thread_exit_status);     /* Terminate thread.        */
+  /* exit the thread */
+  pthread_exit(&__objc_thread_exit_status);
+
+  /* Failed if we reached here */
   return -1;
 }
 
-/********
- *  Returns an integer value which uniquely describes a thread.  Must not be
- *  -1 which is reserved as a marker for "no thread".
- */
+/* Returns an integer value which uniquely describes a thread. */
 objc_thread_t
-objc_thread_id(void)
+__objc_thread_id(void)
 {
   pthread_t self = pthread_self();
 
-  return (objc_thread_t) self;               /* Return thread handle.    */
+  return *(objc_thread_t *)&self;
 }
 
-/********
- *  Sets the thread's local storage pointer.  Returns 0 if successful or -1
- *  if failed.
- */
+/* Sets the thread's local storage pointer. */
 int
-objc_thread_set_data(void *value)
+__objc_thread_set_data(void *value)
 {
-    if (pthread_setspecific(__objc_thread_data_key, (void *)value) == 0)
-        return 0;                           	/* Return thread data.      */
-    return -1;
+  return pthread_setspecific(_objc_thread_storage, value);
 }
 
-/********
- *  Returns the thread's local storage pointer.  Returns NULL on failure.
- */
+/* Returns the thread's local storage pointer. */
 void *
-objc_thread_get_data(void)
+__objc_thread_get_data(void)
+{
+  return pthread_getspecific(_objc_thread_storage);
+}
+
+/* Backend mutex functions */
+
+/* Allocate a mutex. */
+int
+__objc_mutex_allocate(objc_mutex_t mutex)
 {
-    return pthread_getspecific(__objc_thread_data_key);
+  if (pthread_mutex_init((pthread_mutex_t *)(&(mutex->backend)), NULL))
+    return -1;
+  else
+    return 0;
 }
 
-/********
- *  Allocate a mutex.  Return the mutex pointer if successful or NULL if
- *  the allocation fails for any reason.
- */
-objc_mutex_t
-objc_mutex_allocate(void)
+/* Deallocate a mutex. */
+int
+__objc_mutex_deallocate(objc_mutex_t mutex)
 {
-    objc_mutex_t mutex;
-    int         err = 0;
-    
-    if (!(mutex = (objc_mutex_t)objc_malloc(sizeof(struct objc_mutex))))
-        return NULL;                            /* Abort if malloc failed.  */
-
-    err = pthread_mutex_init(&mutex->lock, NULL);
-    
-    if (err != 0) {                             /* System init failed?      */
-        objc_free(mutex);                       /* Yes, free local memory.  */
-        return NULL;                            /* Abort.                   */
-    }
-    mutex->owner = NULL;                        /* No owner.                */
-    mutex->depth = 0;                           /* No locks.                */
-    return mutex;                               /* Return mutex handle.     */
+  if (pthread_mutex_destroy((pthread_mutex_t *)(&(mutex->backend))))
+    return -1;
+  else
+    return 0;
 }
 
-/********
- *  Deallocate a mutex.  Note that this includes an implicit mutex_lock to
- *  insure that no one else is using the lock.  It is legal to deallocate
- *  a lock if we have a lock on it, but illegal to deallotcate a lock held
- *  by anyone else.
- *  Returns the number of locks on the thread.  (1 for deallocate).
- */
+/* Grab a lock on a mutex. */
 int
-objc_mutex_deallocate(objc_mutex_t mutex)
+__objc_mutex_lock(objc_mutex_t mutex)
 {
-    int         depth;                          /* # of locks on mutex.     */
-
-    if (!mutex)                                 /* Is argument bad?         */
-        return -1;                              /* Yes, abort.              */
-    depth = objc_mutex_lock(mutex);             /* Must have lock.          */
-    
-    pthread_mutex_unlock(&mutex->lock);         /* Must unlock system mutex.*/
-    pthread_mutex_destroy(&mutex->lock);        /* Free system mutex.       */
-    
-    objc_free(mutex);                           /* Free memory.             */
-    return depth;                               /* Return last depth.       */
+  return pthread_mutex_lock((pthread_mutex_t *)(&(mutex->backend)));
 }
 
-/********
- *  Grab a lock on a mutex.  If this thread already has a lock on this mutex
- *  then we increment the lock count.  If another thread has a lock on the 
- *  mutex we block and wait for the thread to release the lock.
- *  Returns the lock count on the mutex held by this thread.
- */
+/* Try to grab a lock on a mutex. */
 int
-objc_mutex_lock(objc_mutex_t mutex)
+__objc_mutex_trylock(objc_mutex_t mutex)
 {
-    objc_thread_t     thread_id;                /* Cache our thread id. */
-
-    if (!mutex)                                 /* Is argument bad?         */
-        return -1;                              /* Yes, abort.              */
-    thread_id = objc_thread_id();               /* Get this thread's id.    */
-    if (mutex->owner == thread_id)              /* Already own lock?        */
-        return ++mutex->depth;                  /* Yes, increment depth.    */
-
-    if (pthread_mutex_lock(&mutex->lock) != 0)  /* Lock DCE system mutex.   */
-        return -1;                              /* Failed, abort.           */
-    
-    mutex->owner = thread_id;                   /* Mark thread as owner.    */
-    return mutex->depth = 1;                    /* Increment depth to end.  */
+  return pthread_mutex_trylock((pthread_mutex_t *)(&(mutex->backend)));
 }
 
-/********
- *  Try to grab a lock on a mutex.  If this thread already has a lock on
- *  this mutex then we increment the lock count and return it.  If another
- *  thread has a lock on the mutex returns -1.
- */
+/* Unlock the mutex */
 int
-objc_mutex_trylock(objc_mutex_t mutex)
+__objc_mutex_unlock(objc_mutex_t mutex)
 {
-    objc_thread_t    thread_id;                 /* Cache our thread id. */
-
-    if (!mutex)                                 /* Is argument bad?         */
-        return -1;                              /* Yes, abort.              */
-    thread_id = objc_thread_id();               /* Get this thread's id.    */
-    if (mutex->owner == thread_id)              /* Already own lock?        */
-        return ++mutex->depth;                  /* Yes, increment depth.    */
-    
-    if (pthread_mutex_trylock(&mutex->lock) != 1) /* Lock DCE system mutex. */
-        return -1;                              /* Failed, abort.           */
-    
-    mutex->owner = thread_id;                   /* Mark thread as owner.    */
-    return mutex->depth = 1;                    /* Increment depth to end.  */
+  return pthread_mutex_unlock((pthread_mutex_t *)(&(mutex->backend)));
 }
 
-/********
- *  Decrements the lock count on this mutex by one.  If the lock count reaches
- *  zero, release the lock on the mutex.  Returns the lock count on the mutex.
- *  It is an error to attempt to unlock a mutex which this thread doesn't hold
- *  in which case return -1 and the mutex is unaffected.
- *  Will also return -1 if the mutex free fails.
- */
+/* Backend condition mutex functions */
+
+/* Allocate a condition. */
 int
-objc_mutex_unlock(objc_mutex_t mutex)
+__objc_condition_allocate(objc_condition_t condition)
 {
-    objc_thread_t   thread_id;                 /* Cache our thread id.     */
-    
-    if (!mutex)                                 /* Is argument bad?         */
-        return -1;                              /* Yes, abort.              */
-    thread_id = objc_thread_id();               /* Get this thread's id.    */
-    if (mutex->owner != thread_id)              /* Does some else own lock? */
-        return -1;                              /* Yes, abort.              */
-    if (mutex->depth > 1)                       /* Released last lock?      */
-        return --mutex->depth;                  /* No, Decrement depth, end.*/
-    mutex->depth = 0;                           /* Yes, reset depth to 0.   */
-    mutex->owner = NULL;                        /* Set owner to "no thread".*/
-    
-    if (pthread_mutex_unlock(&mutex->lock) != 0)  /* Unlock system mutex.   */
-        return -1;                              /* Failed, abort.           */
-    
-    return 0;                                   /* No, return success.      */
+  if (pthread_cond_init((pthread_cond_t *)(&(condition->backend)), NULL))
+    return -1;
+  else
+    return 0;
 }
+
+/* Deallocate a condition. */
+int
+__objc_condition_deallocate(objc_condition_t condition)
+{
+  return pthread_cond_destroy((pthread_cond_t *)(&(condition->backend)));
+}
+
+/* Wait on the condition */
+int
+__objc_condition_wait(objc_condition_t condition, objc_mutex_t mutex)
+{
+  return pthread_cond_wait((pthread_cond_t *)(&(condition->backend)),
+			   (pthread_mutex_t *)(&(mutex->backend)));
+}
+
+/* Wake up all threads waiting on this condition. */
+int
+__objc_condition_broadcast(objc_condition_t condition)
+{
+  return pthread_cond_broadcast((pthread_cond_t *)(&(condition->backend)));
+}
+
+/* Wake up one thread waiting on this condition. */
+int
+__objc_condition_signal(objc_condition_t condition)
+{
+  return pthread_cond_signal((pthread_cond_t *)(&(condition->backend)));
+}
+
+/* End of File */