Enlist the FreeBSD-CURRENT users as testers of what is to become Gcc 3.1.0.

These bits are taken from the FSF anoncvs repo on 1-Feb-2002 08:20 PST.

1 files changed, 375 insertions, 28 deletions

diff --git a/contrib/gcc/gthr-dce.h b/contrib/gcc/gthr-dce.h
index 3cba8a0..afefaca 100644
--- a/contrib/gcc/gthr-dce.h
+++ b/contrib/gcc/gthr-dce.h
@@ -1,23 +1,23 @@
 
 /* Compile this one with gcc.  */
-/* Copyright (C) 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1997, 1999, 2000, 2001 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,
@@ -26,42 +26,71 @@ Boston, MA 02111-1307, USA.  */
    This exception does not however invalidate any other reasons why
    the executable file might be covered by the GNU General Public License.  */
 
-#ifndef __gthr_dce_h
-#define __gthr_dce_h
+#ifndef GCC_GTHR_DCE_H
+#define GCC_GTHR_DCE_H
 
+/* If _DCE_THREADS is not defined, then we're building the single
+   threaded version of the libraries and do not want to reference
+   anything related to pthreads or dce.  */
+#ifndef _DCE_THREADS
+#include "gthr-single.h"
+#else
 /* DCE threads interface.
    DCE threads are based on POSIX threads draft 4, and many things
-   have changed since then. */
+   have changed since then.  */
 
 #define __GTHREADS 1
 
 #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;
 
 #define __GTHREAD_ONCE_INIT pthread_once_init
-/* Howto define __GTHREAD_MUTEX_INIT? */
+
+#define __GTHREAD_MUTEX_INIT_FUNCTION __gthread_mutex_init_function
+
+#define __GTHREAD_MUTEX_INIT_DEFAULT pthread_once_init
 
 #if SUPPORTS_WEAK && GTHREAD_USE_WEAK
 
 #pragma weak pthread_once
 #pragma weak pthread_once_init
-#pragma weak pthread_key_create
+#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
 
-static void *__gthread_active_ptr = &pthread_create;
+#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
+#endif
+
+static void *__gthread_active_ptr = (void *) &pthread_create;
 
 static inline int
-__gthread_active_p ()
+__gthread_active_p (void)
 {
   return __gthread_active_ptr != 0;
 }
@@ -69,15 +98,320 @@ __gthread_active_p ()
 #else /* not SUPPORTS_WEAK */
 
 static inline int
-__gthread_active_p ()
+__gthread_active_p (void)
 {
   return 1;
 }
 
 #endif /* SUPPORTS_WEAK */
 
+#ifdef _LIBOBJC
+
+/* Key structure for maintaining thread specific storage */
+static pthread_key_t _objc_thread_storage;
+
+/* Thread local storage for a single thread */
+static void *thread_local_storage = NULL;
+
+/* Backend initialization functions */
+
+/* Initialize the threads subsystem.  */
+static inline int
+__gthread_objc_init_thread_system(void)
+{
+  if (__gthread_active_p ())
+    /* Initialize the thread storage key */
+    return pthread_keycreate (&_objc_thread_storage, NULL);
+  else
+    return -1;
+}
+
+/* Close the threads subsystem.  */
+static inline int
+__gthread_objc_close_thread_system(void)
+{
+  if (__gthread_active_p ())
+    return 0;
+  else
+    return -1;
+}
+
+/* Backend thread functions */
+
+/* Create a new thread of execution.  */
+static inline objc_thread_t
+__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)) )
+    {
+      /* ??? May not work! (64bit) */
+      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)
+{
+  int sys_priority = 0;
+
+  if (!__gthread_active_p ())
+    return -1;
+
+  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;
+    }
+    
+  /* Change the priority.  */
+  if (pthread_setprio(pthread_self(), sys_priority) >= 0)
+    return 0;
+  else
+    /* Failed */
+    return -1;
+}
+
+/* Return the current thread's priority.  */
+static inline int
+__gthread_objc_thread_get_priority(void)
+{
+  int sys_priority;
+
+  if (__gthread_active_p ())
+    {
+      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;
+	}
+
+      /* Failed */
+      return -1;
+    }
+  else
+    return OBJC_THREAD_INTERACTIVE_PRIORITY;
+}
+
+/* Yield our process time to another thread.  */
+static inline void
+__gthread_objc_thread_yield(void)
+{
+  if (__gthread_active_p ())
+    pthread_yield();
+}
+
+/* Terminate the current thread.  */
+static inline int
+__gthread_objc_thread_exit(void)
+{
+  if (__gthread_active_p ())
+    /* 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.  */
+static inline objc_thread_t
+__gthread_objc_thread_id(void)
+{
+  if (__gthread_active_p ())
+    {
+      pthread_t self = pthread_self();
+
+      return (objc_thread_t) pthread_getunique_np (&self);
+    }
+  else
+    return (objc_thread_t)1;
+}
+
+/* Sets the thread's local storage pointer.  */
+static inline int
+__gthread_objc_thread_set_data(void *value)
+{
+  if (__gthread_active_p ())
+    return pthread_setspecific(_objc_thread_storage, value);
+  else
+    {
+      thread_local_storage = value;
+      return 0;
+    }
+}
+
+/* Returns the thread's local storage pointer.  */
+static inline void *
+__gthread_objc_thread_get_data(void)
+{
+  void *value = NULL;
+
+  if (__gthread_active_p ())
+    {
+      if ( !(pthread_getspecific(_objc_thread_storage, &value)) )
+	return value;
+
+      return NULL;
+    }
+  else
+    return thread_local_storage;
+}
+
+/* Backend mutex functions */
+
+/* Allocate a mutex.  */
+static inline int
+__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;
+        }
+    }
+
+  return 0;
+}
+
+/* Deallocate a mutex.  */
+static inline int
+__gthread_objc_mutex_deallocate(objc_mutex_t mutex)
+{
+  if (__gthread_active_p ())
+    {
+      if (pthread_mutex_destroy((pthread_mutex_t *)mutex->backend))
+        return -1;
+
+      objc_free(mutex->backend);
+      mutex->backend = NULL;
+    }
+
+  return 0;
+}
+
+/* Grab a lock on a mutex.  */
+static inline int
+__gthread_objc_mutex_lock(objc_mutex_t mutex)
+{
+  if (__gthread_active_p ())
+    return 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)
+{
+  if (__gthread_active_p ()
+      && pthread_mutex_trylock((pthread_mutex_t *)mutex->backend) != 1)
+    return -1;
+
+  return 0;
+}
+
+/* Unlock the mutex */
+static inline int
+__gthread_objc_mutex_unlock(objc_mutex_t mutex)
+{
+  if (__gthread_active_p ())
+    return pthread_mutex_unlock((pthread_mutex_t *)mutex->backend);
+  else
+    return 0;
+}
+
+/* Backend condition mutex functions */
+
+/* Allocate a condition.  */
+static inline int
+__gthread_objc_condition_allocate(objc_condition_t condition)
+{
+  if (__gthread_active_p ())
+    /* Unimplemented.  */
+    return -1;
+  else
+    return 0;
+}
+
+/* Deallocate a condition.  */
 static inline int
-__gthread_once (__gthread_once_t *once, void (*func) ())
+__gthread_objc_condition_deallocate(objc_condition_t condition)
+{
+  if (__gthread_active_p ())
+    /* Unimplemented.  */
+    return -1;
+  else
+    return 0;
+}
+
+/* Wait on the condition */
+static inline int
+__gthread_objc_condition_wait(objc_condition_t condition, objc_mutex_t mutex)
+{
+  if (__gthread_active_p ())
+    /* Unimplemented.  */
+    return -1;
+  else
+    return 0;
+}
+
+/* Wake up all threads waiting on this condition.  */
+static inline int
+__gthread_objc_condition_broadcast(objc_condition_t condition)
+{
+  if (__gthread_active_p ())
+    /* Unimplemented.  */
+    return -1;
+  else
+    return 0;
+}
+
+/* Wake up one thread waiting on this condition.  */
+static inline int
+__gthread_objc_condition_signal(objc_condition_t condition)
+{
+  if (__gthread_active_p ())
+    /* Unimplemented.  */
+    return -1;
+  else
+    return 0;
+}
+
+#else /* _LIBOBJC */
+
+static inline int
+__gthread_once (__gthread_once_t *once, void (*func) (void))
 {
   if (__gthread_active_p ())
     return pthread_once (once, func);
@@ -92,16 +426,17 @@ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
 }
 
 static inline int
-__gthread_key_dtor (__gthread_key_t key, void *ptr)
+__gthread_key_dtor (UNUSED (__gthread_key_t key), UNUSED (void *ptr))
 {
-  /* Nothing needed. */
+  /* Nothing needed.  */
   return 0;
 }
 
 static inline int
-__gthread_key_delete (__gthread_key_t key)
+__gthread_key_delete (UNUSED (__gthread_key_t key))
 {
-  return pthread_key_delete (key);
+  /* Operation is not supported.  */
+  return -1;
 }
 
 static inline void *
@@ -120,6 +455,13 @@ __gthread_setspecific (__gthread_key_t key, const void *ptr)
   return 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);
+}
+
 static inline int
 __gthread_mutex_lock (__gthread_mutex_t *mutex)
 {
@@ -147,4 +489,9 @@ __gthread_mutex_unlock (__gthread_mutex_t *mutex)
     return 0;
 }
 
-#endif /* not __gthr_dce_h */
+#endif /* _LIBOBJC */
+
+#undef UNUSED
+
+#endif
+#endif /* ! GCC_GTHR_DCE_H */