X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fgthr-dce.h;h=d876c659e06df27089e86862dfde425eb9f690fc;hb=99f2248e961ae8770af13ccd04282b83758500e5;hp=957f227292470db52602684861150b1fdba779e1;hpb=cee68eb12f67394f89388b9acffc550a01f15428;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/gthr-dce.h b/gcc/gthr-dce.h
index 957f2272924..d876c659e06 100644
--- a/gcc/gthr-dce.h
+++ b/gcc/gthr-dce.h
@@ -1,6 +1,7 @@
-
+/* Threads compatibility routines for libgcc2 and libobjc.  */
 /* Compile this one with gcc.  */
-/* Copyright (C) 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2001, 2004, 2005
+   Free Software Foundation, Inc.
 
 This file is part of GCC.
 
@@ -16,8 +17,8 @@ for more details.
 
 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,
@@ -43,54 +44,67 @@ Software Foundation, 59 Temple Place - Suite 330, 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 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 pthread_once_init
 
 #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
+# define __gthrw(name) \
+  static __typeof(name) __gthrw_ ## name __attribute__ ((__weakref__(#name)));
+# define __gthrw_(name) __gthrw_ ## name
+#else
+# define __gthrw(name)
+# define __gthrw_(name) name
+#endif
 
-#pragma weak pthread_once
-#pragma weak pthread_once_init
-#pragma weak pthread_keycreate
-#pragma weak pthread_key_delete
-#pragma weak pthread_getspecific
-#pragma weak pthread_setspecific
-#pragma weak pthread_create
-#pragma weak pthread_mutex_init
-#pragma weak pthread_mutex_lock
-#pragma weak pthread_mutex_trylock
-#pragma weak pthread_mutex_unlock
+__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.  */
-#pragma weak pthread_cond_broadcast
-#pragma weak pthread_cond_destroy
-#pragma weak pthread_cond_init
-#pragma weak pthread_cond_signal
-#pragma weak pthread_cond_wait
-#pragma weak pthread_exit
-#pragma weak pthread_getunique_np
-#pragma weak pthread_mutex_destroy
-#pragma weak pthread_self
-#pragma weak pthread_yield
+/* 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)
+
+#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
+
 static inline int
 __gthread_active_p (void)
 {
-  static void *const __gthread_active_ptr = (void *) &pthread_create;
+  static void *const __gthread_active_ptr = (void *) &__gthrw_(pthread_create);
   return __gthread_active_ptr != 0;
 }
 
@@ -116,18 +130,18 @@ static void *thread_local_storage = NULL;
 
 /* 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 */
-    return pthread_keycreate (&_objc_thread_storage, NULL);
+    /* Initialize the thread storage key.  */
+    return __gthrw_(pthread_keycreate) (&_objc_thread_storage, NULL);
   else
     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;
@@ -139,30 +153,30 @@ __gthread_objc_close_thread_system(void)
 
 /* 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, pthread_attr_default,
-  			(void *)func, arg)) )
+
+  if (!(__gthrw_(pthread_create) (&new_thread_handle, pthread_attr_default,
+			(void *) func, arg)))
     {
       /* ??? May not work! (64bit) */
-      thread_id = *(objc_thread_t *)&new_thread_handle;
-      pthread_detach(&new_thread_handle); /* Fully detach thread.  */
+      thread_id = *(objc_thread_t *) &new_thread_handle;
+      pthread_detach (&new_thread_handle); /* Fully detach thread.  */
     }
   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;
 
@@ -182,9 +196,9 @@ __gthread_objc_thread_set_priority(int priority)
       sys_priority = (PRI_BG_MIN_NP + PRI_BG_MAX_NP) / 2;
       break;
     }
-    
+
   /* Change the priority.  */
-  if (pthread_setprio(pthread_self(), sys_priority) >= 0)
+  if (pthread_setprio (__gthrw_(pthread_self) (), sys_priority) >= 0)
     return 0;
   else
     /* Failed */
@@ -193,14 +207,14 @@ __gthread_objc_thread_set_priority(int priority)
 
 /* 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 ())
     {
-      if ((sys_priority = pthread_getprio(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)
 	    return OBJC_THREAD_INTERACTIVE_PRIORITY;
@@ -219,19 +233,19 @@ __gthread_objc_thread_get_priority(void)
 
 /* Yield our process time to another thread.  */
 static inline void
-__gthread_objc_thread_yield(void)
+__gthread_objc_thread_yield (void)
 {
   if (__gthread_active_p ())
-    pthread_yield();
+    __gthrw_(pthread_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 */
-    pthread_exit(&__objc_thread_exit_status);
+    __gthrw_(pthread_exit) (&__objc_thread_exit_status);
 
   /* Failed if we reached here */
   return -1;
@@ -239,24 +253,24 @@ __gthread_objc_thread_exit(void)
 
 /* 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();
+      pthread_t self = __gthrw_(pthread_self) ();
 
-      return (objc_thread_t) pthread_getunique_np (&self);
+      return (objc_thread_t) __gthrw_pthread_getunique_np (&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 ())
-    return pthread_setspecific(_objc_thread_storage, value);
+    return __gthrw_(pthread_setspecific) (_objc_thread_storage, value);
   else
     {
       thread_local_storage = value;
@@ -266,13 +280,13 @@ __gthread_objc_thread_set_data(void *value)
 
 /* 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 ( !(pthread_getspecific(_objc_thread_storage, &value)) )
+      if (!(__gthrw_(pthread_getspecific) (_objc_thread_storage, &value)))
 	return value;
 
       return NULL;
@@ -285,19 +299,19 @@ __gthread_objc_thread_get_data(void)
 
 /* 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));
-
-      if (pthread_mutex_init((pthread_mutex_t *)mutex->backend,
-      			    pthread_mutexattr_default))
-        {
-          objc_free(mutex->backend);
-          mutex->backend = NULL;
-          return -1;
-        }
+      mutex->backend = objc_malloc (sizeof (pthread_mutex_t));
+
+      if (__gthrw_(pthread_mutex_init) ((pthread_mutex_t *) mutex->backend,
+			      pthread_mutexattr_default))
+	{
+	  objc_free (mutex->backend);
+	  mutex->backend = NULL;
+	  return -1;
+	}
     }
 
   return 0;
@@ -305,14 +319,14 @@ __gthread_objc_mutex_allocate(objc_mutex_t 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 ())
     {
-      if (pthread_mutex_destroy((pthread_mutex_t *)mutex->backend))
-        return -1;
+      if (__gthrw_(pthread_mutex_destroy) ((pthread_mutex_t *) mutex->backend))
+	return -1;
 
-      objc_free(mutex->backend);
+      objc_free (mutex->backend);
       mutex->backend = NULL;
     }
 
@@ -321,20 +335,20 @@ __gthread_objc_mutex_deallocate(objc_mutex_t 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);
+    return __gthrw_(pthread_mutex_lock) ((pthread_mutex_t *) mutex->backend);
   else
     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 ()
-      && pthread_mutex_trylock((pthread_mutex_t *)mutex->backend) != 1)
+      && __gthrw_(pthread_mutex_trylock) ((pthread_mutex_t *) mutex->backend) != 1)
     return -1;
 
   return 0;
@@ -342,10 +356,10 @@ __gthread_objc_mutex_trylock(objc_mutex_t mutex)
 
 /* 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);
+    return __gthrw_(pthread_mutex_unlock) ((pthread_mutex_t *) mutex->backend);
   else
     return 0;
 }
@@ -354,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.  */
@@ -365,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.  */
@@ -376,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.  */
@@ -387,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.  */
@@ -398,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.  */
@@ -413,7 +433,7 @@ static inline int
 __gthread_once (__gthread_once_t *once, void (*func) (void))
 {
   if (__gthread_active_p ())
-    return pthread_once (once, func);
+    return __gthrw_(pthread_once) (once, func);
   else
     return -1;
 }
@@ -421,18 +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 pthread_keycreate (key, dtor);
-}
-
-static inline int
-__gthread_key_dtor (UNUSED (__gthread_key_t key), UNUSED (void *ptr))
-{
-  /* Nothing needed.  */
-  return 0;
+  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;
@@ -442,7 +455,7 @@ static inline void *
 __gthread_getspecific (__gthread_key_t key)
 {
   void *ptr;
-  if (pthread_getspecific (key, &ptr) == 0)
+  if (__gthrw_(pthread_getspecific) (key, &ptr) == 0)
     return ptr;
   else
     return 0;
@@ -451,21 +464,21 @@ __gthread_getspecific (__gthread_key_t key)
 static inline int
 __gthread_setspecific (__gthread_key_t key, const void *ptr)
 {
-  return 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 ())
-    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 pthread_mutex_lock (mutex);
+    return __gthrw_(pthread_mutex_lock) (mutex);
   else
     return 0;
 }
@@ -474,7 +487,7 @@ static inline int
 __gthread_mutex_trylock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return pthread_mutex_trylock (mutex);
+    return __gthrw_(pthread_mutex_trylock) (mutex);
   else
     return 0;
 }
@@ -483,14 +496,50 @@ static inline int
 __gthread_mutex_unlock (__gthread_mutex_t *mutex)
 {
   if (__gthread_active_p ())
-    return pthread_mutex_unlock (mutex);
+    return __gthrw_(pthread_mutex_unlock) (mutex);
   else
     return 0;
 }
 
-#endif /* _LIBOBJC */
+static inline int
+__gthread_recursive_mutex_init_function (__gthread_recursive_mutex_t *mutex)
+{
+  if (__gthread_active_p ())
+    {
+      pthread_mutexattr_t attr;
+      int r;
+
+      r = __gthrw_(pthread_mutexattr_create) (&attr);
+      if (!r)
+	r = __gthrw_(pthread_mutexattr_setkind_np) (&attr, MUTEX_RECURSIVE_NP);
+      if (!r)
+	r = __gthrw_(pthread_mutex_init) (mutex, attr);
+      if (!r)
+	r = __gthrw_(pthread_mutexattr_delete) (&attr);
+      return r;
+    }
+  return 0;
+}
+
+static inline int
+__gthread_recursive_mutex_lock (__gthread_recursive_mutex_t *mutex)
+{
+  return __gthread_mutex_lock (mutex);
+}
+
+static inline int
+__gthread_recursive_mutex_trylock (__gthread_recursive_mutex_t *mutex)
+{
+  return __gthread_mutex_trylock (mutex);
+}
 
-#undef UNUSED
+static inline int
+__gthread_recursive_mutex_unlock (__gthread_recursive_mutex_t *mutex)
+{
+  return __gthread_mutex_unlock (mutex);
+}
+
+#endif /* _LIBOBJC */
 
 #endif
 #endif /* ! GCC_GTHR_DCE_H */