This is the mail archive of the
java-patches@sourceware.cygnus.com
mailing list for the Java project.
Patch: no more qthreads in boehm-gc
- To: Java Patch List <java-patches at sourceware dot cygnus dot com>
- Subject: Patch: no more qthreads in boehm-gc
- From: Tom Tromey <tromey at cygnus dot com>
- Date: 04 Nov 1999 10:23:57 -0700
- Reply-To: tromey at cygnus dot com
I'm committing the appended patch. It removes qthreads support from
the sourceware Boehm GC. I'm doing this because this code is useless
outside Cygnus, and it is a barrier to zero divergence from the
upstream version of the collector.
1999-11-04 Tom Tromey <tromey@cygnus.com>
* configure: Rebuilt.
* configure.in: Removed qt threads case.
* dyn_load.c: Don't mention QUICK_THREADS.
* os_dep.c: Don't mention QUICK_THREADS.
* misc.c: Don't mention QUICK_THREADS.
* gcconfig.h: Don't mention QUICK_THREADS.
* gc_priv.h: Removed QUICK_THREADS code.
* quick_threads.c: Removed.
Tom
Index: configure.in
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/configure.in,v
retrieving revision 1.15
diff -u -r1.15 configure.in
--- configure.in 1999/11/03 01:11:03 1.15
+++ configure.in 1999/11/04 17:11:51
@@ -84,11 +84,6 @@
esac
THREADLIB=-lpthread
;;
- qt)
- AC_DEFINE(QUICK_THREADS)
- INCLUDES="-I${boehm_gc_basedir}/../qthreads"
- THREADLIB=../qthreads/libgcjcoop.la
- ;;
decosf1 | irix | mach | os2 | solaris | win32 | dce | vxworks)
AC_MSG_ERROR(thread package $THREADS not yet supported)
;;
Index: dyn_load.c
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/dyn_load.c,v
retrieving revision 1.5
diff -u -r1.5 dyn_load.c
--- dyn_load.c 1999/11/01 23:15:51 1.5
+++ dyn_load.c 1999/11/04 17:12:07
@@ -161,8 +161,7 @@
# if defined(SUNOS4) || defined(SUNOS5DL)
/* Add dynamic library data sections to the root set. */
-# if !defined(PCR) && !defined(SOLARIS_THREADS) \
- && !defined(QUICK_THREADS) && defined(THREADS)
+# if !defined(PCR) && !defined(SOLARIS_THREADS) && defined(THREADS)
# ifndef SRC_M3
--> fix mutual exclusion with dlopen
# endif /* We assume M3 programs don't call dlopen for now */
Index: gc_priv.h
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/gc_priv.h,v
retrieving revision 1.8
diff -u -r1.8 gc_priv.h
--- gc_priv.h 1999/11/03 01:11:03 1.8
+++ gc_priv.h 1999/11/04 17:12:33
@@ -594,10 +594,6 @@
# define LOCK() EnterCriticalSection(&GC_allocate_ml);
# define UNLOCK() LeaveCriticalSection(&GC_allocate_ml);
# endif
-# ifdef QUICK_THREADS
-# define LOCK()
-# define UNLOCK()
-# endif
# ifndef SET_LOCK_HOLDER
# define SET_LOCK_HOLDER()
# define UNSET_LOCK_HOLDER()
Index: gcconfig.h
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/gcconfig.h,v
retrieving revision 1.4
diff -u -r1.4 gcconfig.h
--- gcconfig.h 1999/11/03 17:26:59 1.4
+++ gcconfig.h 1999/11/04 17:13:39
@@ -1186,8 +1186,7 @@
# if defined(PCR) || defined(SRC_M3) || \
defined(SOLARIS_THREADS) || defined(WIN32_THREADS) || \
defined(IRIX_THREADS) || defined(LINUX_THREADS) || \
- defined(IRIX_JDK_THREADS) || defined(HPUX_THREADS) || \
- defined(QUICK_THREADS)
+ defined(IRIX_JDK_THREADS) || defined(HPUX_THREADS)
# define THREADS
# endif
Index: misc.c
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/misc.c,v
retrieving revision 1.6
diff -u -r1.6 misc.c
--- misc.c 1999/11/01 23:15:51 1.6
+++ misc.c 1999/11/04 17:14:03
@@ -49,11 +49,7 @@
# if defined(HPUX_THREADS)
pthread_mutex_t GC_allocate_ml = PTHREAD_MUTEX_INITIALIZER;
# else
-# if defined(QUICK_THREADS)
- /* Nothing */
-# else
--> declare allocator lock here
-# endif
# endif
# endif
# endif
@@ -469,7 +465,7 @@
# endif
# if !defined(THREADS) || defined(SOLARIS_THREADS) || defined(WIN32_THREADS) \
|| defined(IRIX_THREADS) || defined(LINUX_THREADS) \
- || defined(HPUX_THREADS) || defined(QUICK_THREADS)
+ || defined(HPUX_THREADS)
if (GC_stackbottom == 0) {
GC_stackbottom = GC_get_stack_base();
}
Index: os_dep.c
===================================================================
RCS file: /cvs/java/libgcj/boehm-gc/os_dep.c,v
retrieving revision 1.6
diff -u -r1.6 os_dep.c
--- os_dep.c 1999/11/01 23:15:51 1.6
+++ os_dep.c 1999/11/04 17:14:25
@@ -1536,8 +1536,7 @@
# if defined(SOLARIS_THREADS) || defined(WIN32_THREADS) \
|| defined(IRIX_THREADS) || defined(LINUX_THREADS) \
- || defined(IRIX_JDK_THREADS) || defined(HPUX_THREADS) \
- || defined(QUICK_THREADS)
+ || defined(IRIX_JDK_THREADS) || defined(HPUX_THREADS)
extern void GC_push_all_stacks();