Thread support for VxWorks

Thread support for VxWorks

[Mike Stump]

Here is a first cut at thread support for C++ EH.  I noticed that the
FSF doesn't have thread support yet, does someone want to work on
getting all the threading work into the FSF tree?

1998-02-05  Mike Stump  <mrs@wrs.com>

	* gthr.h: Support systems that don't have weak, but have threads.
	* configure.in (*wrs-vxworks*): Use VxWorks threads by default.
	* gthr-vxworks.h: New file.
	* objc/thr-vxworks.h: Dummy file from thr-single.c for now.
	
Doing diffs in .:
*** ./gcc/gthr.h.~1~	Thu Jan 15 17:14:23 1998
--- ./gcc/gthr.h	Thu Feb  5 15:02:58 1998
*************** Boston, MA 02111-1307, USA.  */
*** 82,90 ****
  #include "gthr-solaris.h"
  
  /* Include GTHREAD_FILE if one is defined. */
! #elif SUPPORTS_WEAK && HAVE_GTHR_DEFAULT
  #ifndef GTHREAD_USE_WEAK
  #define GTHREAD_USE_WEAK 1
  #endif
  #include "gthr-default.h"
  
--- 82,92 ----
  #include "gthr-solaris.h"
  
  /* Include GTHREAD_FILE if one is defined. */
! #elif defined(HAVE_GTHR_DEFAULT)
! #if SUPPORTS_WEAK
  #ifndef GTHREAD_USE_WEAK
  #define GTHREAD_USE_WEAK 1
+ #endif
  #endif
  #include "gthr-default.h"
  
*** ./gcc/configure.in.~1~	Mon Feb  2 17:22:10 1998
--- ./gcc/configure.in	Tue Feb  3 14:16:05 1998
*************** case x${enable_threads} in
*** 114,120 ****
  		target_thread_file=''
  		;;
  	xdecosf1 | xirix | xmach | xos2 | xposix | xpthreads | xsingle | \
! 	xsolaris | xwin32 | xdce)
  		target_thread_file=$enable_threads
  		;;
  	*)
--- 114,120 ----
  		target_thread_file=''
  		;;
  	xdecosf1 | xirix | xmach | xos2 | xposix | xpthreads | xsingle | \
! 	xsolaris | xwin32 | xdce | xvxworks)
  		target_thread_file=$enable_threads
  		;;
  	*)
*************** for machine in $build $host $target; do
*** 304,313 ****
  		tm_file="${tm_file} dbxcoff.h a29k/udi.h"
  		tmake_file=a29k/t-a29kbare
  		;;
! 	a29k-*-vxworks*)
  		tm_file="${tm_file} dbxcoff.h a29k/udi.h a29k/vx29k.h"
  		tmake_file=a29k/t-vx29k
  		extra_parts="crtbegin.o crtend.o"
  		;;
  	a29k-*-*)			# Default a29k environment.
  		use_collect2=yes
--- 304,314 ----
  		tm_file="${tm_file} dbxcoff.h a29k/udi.h"
  		tmake_file=a29k/t-a29kbare
  		;;
! 	a29k-wrs-vxworks*)
  		tm_file="${tm_file} dbxcoff.h a29k/udi.h a29k/vx29k.h"
  		tmake_file=a29k/t-vx29k
  		extra_parts="crtbegin.o crtend.o"
+ 		thread_file='vxworks'
  		;;
  	a29k-*-*)			# Default a29k environment.
  		use_collect2=yes
*************** for machine in $build $host $target; do
*** 1099,1114 ****
--- 1100,1118 ----
  		tm_file="${tm_file} i960/vx960.h"
  		tmake_file=i960/t-vxworks960
  		use_collect2=yes
+ 		thread_file='vxworks'
  		;;
  	i960-wrs-vxworks5* | i960-wrs-vxworks)
  		tm_file="${tm_file} dbxcoff.h i960/i960-coff.h i960/vx960-coff.h"
  		tmake_file=i960/t-vxworks960
  		use_collect2=yes
+ 		thread_file='vxworks'
  		;;
  	i960-wrs-vxworks*)
  		tm_file="${tm_file} i960/vx960.h"
  		tmake_file=i960/t-vxworks960
  		use_collect2=yes
+ 		thread_file='vxworks'
  		;;
  	i960-*-coff*)
  		tm_file="${tm_file} dbxcoff.h i960/i960-coff.h libgloss.h"
*************** for machine in $build $host $target; do
*** 1419,1424 ****
--- 1423,1429 ----
  		tm_file=m68k/vxm68k.h
  		tmake_file=m68k/t-vxworks68
  		extra_headers=math-68881.h
+ 		thread_file='vxworks'
  		;;
  	m68k-*-aout*)
  		tmake_file=m68k/t-m68kbare
*************** for machine in $build $host $target; do
*** 2161,2172 ****
  			thread_file='posix'
  		fi
  		;;
!         powerpc-*-vxworks*)
                  cpu_type=rs6000
                  xm_file=rs6000/xm-sysv4.h
                  tm_file=rs6000/vxppc.h
                  tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
  		extra_headers=ppc-asm.h
                  ;;
  	powerpcle-*-sysv* | powerpcle-*-elf*)
  		tm_file=rs6000/sysv4le.h
--- 2166,2178 ----
  			thread_file='posix'
  		fi
  		;;
!         powerpc-wrs-vxworks*)
                  cpu_type=rs6000
                  xm_file=rs6000/xm-sysv4.h
                  tm_file=rs6000/vxppc.h
                  tmake_file="rs6000/t-ppcgas rs6000/t-ppccomm"
  		extra_headers=ppc-asm.h
+ 		thread_file='vxworks'
                  ;;
  	powerpcle-*-sysv* | powerpcle-*-elf*)
  		tm_file=rs6000/sysv4le.h
*************** for machine in $build $host $target; do
*** 2298,2303 ****
--- 2304,2310 ----
  		tm_file=sparc/vxsparc.h
  		tmake_file=sparc/t-vxsparc
  		use_collect2=yes
+ 		thread_file='vxworks'
  		;;
  	sparc-*-aout*)
  		tmake_file=sparc/t-sparcbare
*** ./gcc/gthr-vxworks.h.~1~	Fri Jan 30 11:29:49 1998
--- ./gcc/gthr-vxworks.h	Wed Feb  4 19:42:45 1998
***************
*** 0 ****
--- 1,132 ----
+ /* Threads compatibily routines for libgcc2 for VxWorks.  */
+ /* Compile this one with gcc.  */
+ /* Copyright (C) 1997 Free Software Foundation, Inc.
+    Contributed by Mike Stump <mrs@wrs.com>.
+ 
+ This file is part of GNU CC.
+ 
+ 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.
+ 
+ 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.
+ 
+ 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.  */
+ 
+ /* As a special exception, if you link this library with other files,
+    some of which are compiled with GCC, to produce an executable,
+    this library does not by itself cause the resulting executable
+    to be covered by the GNU General Public License.
+    This exception does not however invalidate any other reasons why
+    the executable file might be covered by the GNU General Public License.  */
+ 
+ #ifndef __gthr_vxworks_h
+ #define __gthr_vxworks_h
+ 
+ /* POSIX threads specific definitions.
+    Easy, since the interface is just one-to-one mapping. */
+ 
+ #define __GTHREADS 1
+ 
+ #include <vxWorks.h>
+ #include <semLib.h>
+ /* typedef void *SEM_ID; */
+ 
+ typedef int __gthread_key_t;
+ typedef char __gthread_once_t;
+ typedef SEM_ID __gthread_mutex_t;
+ 
+ #define __GTHREAD_MUTEX_INIT 0
+ #define __GTHREAD_ONCE_INIT 0
+ 
+ #ifndef REG_SAVED_REG
+ static inline int
+ __gthread_once (__gthread_once_t *once, void (*func) ())
+ {
+   (*func)();
+   return 0;
+ }
+ 
+ extern __gthread_key_t eh_context_key;
+ 
+ /* This is not the right way to do it, but the semantic of pthreads
+    don't map well enough onto VxWorks.  */
+ 
+ static void
+ __ehdtor ()
+ {
+   if (eh_context_key)
+     free ((void*)eh_context_key);
+   eh_context_key = 0;
+ }
+ 
+ /* This only works for the code in libgcc2.c.  */
+ 
+ static inline int
+ __gthread_key_create (__gthread_key_t *key, void (*dtor) (void *))
+ {
+   *key = 0;
+ 
+   /* We don't have a way to track dtor here, so instead, we
+      register a generic routine that can cleanup any task.  */
+ 
+   taskDeleteHookAdd (__ehdtor);
+ 
+   return 0;
+ }
+ 
+ #define __gthread_setspecific(key, ptr) \
+   (key = (int) ptr, 0)
+ 
+ static inline int
+ __gthread_key_dtor (__gthread_key_t key, void *ptr)
+ {
+   /* Just reset the key value to zero. */
+   if (ptr)
+     return __gthread_setspecific (key, 0);
+   else
+     return 0;
+ }
+ 
+ #define __gthread_key_delete(key) \
+   taskVarDelete (taskIdSelf (), &key)
+ 
+ #define __gthread_getspecific(key)			\
+      ((key == 0)					\
+       ? ((taskVarAdd (taskIdSelf (), &key) != OK)	\
+ 	 ? (__terminate (), (void*)0)			\
+ 	 : (void*)0)					\
+       : (void*)key)
+ #endif
+ 
+ static inline int
+ __gthread_mutex_lock (__gthread_mutex_t *mutex)
+ {
+   if (*mutex == 0)
+     *mutex = semMCreate (SEM_Q_PRIORITY | SEM_INVERSION_SAFE | SEM_DELETE_SAFE);
+   return semTake (*mutex, WAIT_FOREVER);
+ }
+ 
+ static inline int
+ __gthread_mutex_trylock (__gthread_mutex_t *mutex)
+ {
+   if (*mutex == 0)
+     *mutex = semMCreate (SEM_Q_PRIORITY | SEM_INVERSION_SAFE | SEM_DELETE_SAFE);
+   return semTake (*mutex, NO_WAIT);
+ }
+ 
+ static inline int
+ __gthread_mutex_unlock (__gthread_mutex_t *mutex)
+ {
+   /* We could return the */
+   return semGive (*mutex);
+ }
+ 
+ #endif /* not __gthr_vxworks_h */
*** ./gcc/objc/thr-vxworks.c.~1~	Fri Jan 30 11:41:12 1998
--- ./gcc/objc/thr-vxworks.c	Mon Feb  2 17:57:00 1998
***************
*** 0 ****
--- 1,192 ----
+ /* GNU Objective C Runtime Thread Implementation
+    Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+    Contributed by Galen C. Hunt (gchunt@cs.rochester.edu)
+ 
+ This file is part of GNU CC.
+ 
+ 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.
+ 
+ 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.
+ 
+ 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.  */
+ 
+ /* As a special exception, if you link this library with files compiled with
+    GCC to produce an executable, this does not cause the resulting executable
+    to be covered by the GNU General Public License. This exception does not
+    however invalidate any other reasons why the executable file might be
+    covered by the GNU General Public License.  */
+ 
+ #include <objc/thr.h>
+ #include "runtime.h"
+ 
+ /* Thread local storage for a single thread */
+ static void *thread_local_storage = NULL;
+ 
+ /* Backend initialization functions */
+ 
+ /* Initialize the threads subsystem. */
+ int
+ __objc_init_thread_system(void)
+ {
+   /* No thread support available */
+   return -1;
+ }
+ 
+ /* Close the threads subsystem. */
+ int
+ __objc_close_thread_system(void)
+ {
+   /* No thread support available */
+   return -1;
+ }
+ 
+ /* Backend thread functions */
+ 
+ /* Create a new thread of execution. */
+ objc_thread_t
+ __objc_thread_detach(void (*func)(void *arg), void *arg)
+ {
+   /* No thread support available */
+   return NULL;
+ }
+ 
+ /* Set the current thread's priority. */
+ int
+ __objc_thread_set_priority(int priority)
+ {
+   /* No thread support available */
+   return -1;
+ }
+ 
+ /* Return the current thread's priority. */
+ int
+ __objc_thread_get_priority(void)
+ {
+   return OBJC_THREAD_INTERACTIVE_PRIORITY;
+ }
+ 
+ /* Yield our process time to another thread. */
+ void
+ __objc_thread_yield(void)
+ {
+   return;
+ }
+ 
+ /* Terminate the current thread. */
+ int
+ __objc_thread_exit(void)
+ {
+   /* No thread support available */
+   /* Should we really exit the program */
+   /* exit(&__objc_thread_exit_status); */
+   return -1;
+ }
+ 
+ /* Returns an integer value which uniquely describes a thread. */
+ objc_thread_t
+ __objc_thread_id(void)
+ {
+   /* No thread support, use 1. */
+   return (objc_thread_t)1;
+ }
+ 
+ /* Sets the thread's local storage pointer. */
+ int
+ __objc_thread_set_data(void *value)
+ {
+   thread_local_storage = value;
+   return 0;
+ }
+ 
+ /* Returns the thread's local storage pointer. */
+ void *
+ __objc_thread_get_data(void)
+ {
+   return thread_local_storage;
+ }
+ 
+ /* Backend mutex functions */
+ 
+ /* Allocate a mutex. */
+ int
+ __objc_mutex_allocate(objc_mutex_t mutex)
+ {
+   return 0;
+ }
+ 
+ /* Deallocate a mutex. */
+ int
+ __objc_mutex_deallocate(objc_mutex_t mutex)
+ {
+   return 0;
+ }
+ 
+ /* Grab a lock on a mutex. */
+ int
+ __objc_mutex_lock(objc_mutex_t mutex)
+ {
+   /* There can only be one thread, so we always get the lock */
+   return 0;
+ }
+ 
+ /* Try to grab a lock on a mutex. */
+ int
+ __objc_mutex_trylock(objc_mutex_t mutex)
+ {
+   /* There can only be one thread, so we always get the lock */
+   return 0;
+ }
+ 
+ /* Unlock the mutex */
+ int
+ __objc_mutex_unlock(objc_mutex_t mutex)
+ {
+   return 0;
+ }
+ 
+ /* Backend condition mutex functions */
+ 
+ /* Allocate a condition. */
+ int
+ __objc_condition_allocate(objc_condition_t condition)
+ {
+   return 0;
+ }
+ 
+ /* Deallocate a condition. */
+ int
+ __objc_condition_deallocate(objc_condition_t condition)
+ {
+   return 0;
+ }
+ 
+ /* Wait on the condition */
+ int
+ __objc_condition_wait(objc_condition_t condition, objc_mutex_t mutex)
+ {
+   return 0;
+ }
+ 
+ /* Wake up all threads waiting on this condition. */
+ int
+ __objc_condition_broadcast(objc_condition_t condition)
+ {
+   return 0;
+ }
+ 
+ /* Wake up one thread waiting on this condition. */
+ int
+ __objc_condition_signal(objc_condition_t condition)
+ {
+   return 0;
+ }
+ 
+ /* End of File */
--------------

Re: Thread support for VxWorks

[Jeffrey A Law]

  In message <199802052340.PAA23288@kankakee.wrs.com>you write:
  > Here is a first cut at thread support for C++ EH.  I noticed that the
  > FSF doesn't have thread support yet, does someone want to work on
  > getting all the threading work into the FSF tree?
  > 
  > 1998-02-05  Mike Stump  <mrs@wrs.com>
  > 
  > 	* gthr.h: Support systems that don't have weak, but have threads.
  > 	* configure.in (*wrs-vxworks*): Use VxWorks threads by default.
  > 	* gthr-vxworks.h: New file.
  > 	* objc/thr-vxworks.h: Dummy file from thr-single.c for now.
Nobody seemed to want to comment on this patch.  I don't see that
it'll break anything but possibly VxWorks.  I went ahead and installed
it.

If it causes any problems we'll just have to deal with them.

jeff

Re: Thread support for VxWorks

[Mike Stump]

> Date: Fri, 03 Apr 1998 00:15:34 -0700
> From: Jeffrey A Law <law@hurl.cygnus.com>

> Nobody seemed to want to comment on this patch.

Some days are like that.

> I don't see that it'll break anything but possibly VxWorks.  I went
> ahead and installed it.

> If it causes any problems we'll just have to deal with them.

It anything arises, just let me know and I will try and bump it up and
work on it myself.  I'll keep an eye out for problems.

Thanks.