boehm-gc: revert all CACAO-specific modifications; this is now an exact copy of the...

[cacao.git] / src / mm / boehm-gc / include / private / pthread_support.h

diff --git a/src/mm/boehm-gc/include/private/pthread_support.h b/src/mm/boehm-gc/include/private/pthread_support.h
index 469021b407105e9805a5527f3b860926f5cec362..43248bfdc7376a03fcccb473c8a3f7c80f38e558 100644 (file)
--- a/src/mm/boehm-gc/include/private/pthread_support.h
+++ b/src/mm/boehm-gc/include/private/pthread_support.h
@@ -3,8 +3,7 @@
 
 # include "private/gc_priv.h"
 
-# if defined(GC_PTHREADS) && !defined(GC_SOLARIS_THREADS) \
-     && !defined(GC_WIN32_THREADS)
+# if defined(GC_PTHREADS) && !defined(GC_WIN32_THREADS)
      
 #if defined(GC_DARWIN_THREADS)
 # include "private/darwin_stop_world.h"
@@ -12,6 +11,10 @@
 # include "private/pthread_stop_world.h"
 #endif
 
+#ifdef THREAD_LOCAL_ALLOC
+# include "thread_local_alloc.h"
+#endif /* THREAD_LOCAL_ALLOC */
+
 /* We use the allocation lock to protect thread-related data structures. */
 
 /* The set of all known threads.  We intercept thread creation and     */
@@ -31,7 +34,13 @@ typedef struct GC_Thread_Rep {
     
     short flags;
 #      define FINISHED 1       /* Thread has exited.   */
-#      define DETACHED 2       /* Thread is intended to be detached.   */
+#      define DETACHED 2       /* Thread is treated as detached.       */
+                               /* Thread may really be detached, or    */
+                               /* it may have have been explicitly     */
+                               /* registered, in which case we can     */
+                               /* deallocate its GC_Thread_Rep once    */
+                               /* it unregisters itself, since it      */
+                               /* may not return a GC pointer.         */
 #      define MAIN_THREAD 4    /* True for the original thread only.   */
     short thread_blocked;      /* Protected by GC lock.                */
                                /* Treated as a boolean value.  If set, */
@@ -40,7 +49,8 @@ typedef struct GC_Thread_Rep {
                                /* has set its sp value.  Thus it does  */
                                /* not need to be sent a signal to stop */
                                /* it.                                  */
-    ptr_t stack_end;           /* Cold end of the stack.               */
+    ptr_t stack_end;           /* Cold end of the stack (except for    */
+                               /* main thread).                        */
 #   ifdef IA64
        ptr_t backing_store_end;
        ptr_t backing_store_ptr;
@@ -49,49 +59,22 @@ typedef struct GC_Thread_Rep {
                                /* Used only to avoid premature         */
                                /* reclamation of any data it might     */
                                /* reference.                           */
+                               /* This is unfortunately also the       */
+                               /* reason we need to intercept join     */
+                               /* and detach.                          */
 #   ifdef THREAD_LOCAL_ALLOC
-#      if CPP_WORDSZ == 64 && defined(ALIGN_DOUBLE)
-#          define GRANULARITY 16
-#          define NFREELISTS 49
-#      else
-#          define GRANULARITY 8
-#          define NFREELISTS 65
-#      endif
-       /* The ith free list corresponds to size i*GRANULARITY */
-#      define INDEX_FROM_BYTES(n) ((ADD_SLOP(n) + GRANULARITY - 1)/GRANULARITY)
-#      define BYTES_FROM_INDEX(i) ((i) * GRANULARITY - EXTRA_BYTES)
-#      define SMALL_ENOUGH(bytes) (ADD_SLOP(bytes) <= \
-                                   (NFREELISTS-1)*GRANULARITY)
-       ptr_t ptrfree_freelists[NFREELISTS];
-       ptr_t normal_freelists[NFREELISTS];
-#      ifdef GC_GCJ_SUPPORT
-         ptr_t gcj_freelists[NFREELISTS];
-#      endif
-               /* Free lists contain either a pointer or a small count */
-               /* reflecting the number of granules allocated at that  */
-               /* size.                                                */
-               /* 0 ==> thread-local allocation in use, free list      */
-               /*       empty.                                         */
-               /* > 0, <= DIRECT_GRANULES ==> Using global allocation, */
-               /*       too few objects of this size have been         */
-               /*       allocated by this thread.                      */
-               /* >= HBLKSIZE  => pointer to nonempty free list.       */
-               /* > DIRECT_GRANULES, < HBLKSIZE ==> transition to      */
-               /*    local alloc, equivalent to 0.                     */
-#      define DIRECT_GRANULES (HBLKSIZE/GRANULARITY)
-               /* Don't use local free lists for up to this much       */
-               /* allocation.                                          */
+        struct thread_local_freelists tlfs;
 #   endif
 } * GC_thread;
 
-# define THREAD_TABLE_SZ 128   /* Must be power of 2   */
+# define THREAD_TABLE_SZ 256   /* Must be power of 2   */
 extern volatile GC_thread GC_threads[THREAD_TABLE_SZ];
 
 extern GC_bool GC_thr_initialized;
 
 GC_thread GC_lookup_thread(pthread_t id);
 
-void GC_stop_init();
+void GC_stop_init(void);
 
 extern GC_bool GC_in_thread_creation;
        /* We may currently be in thread creation or destruction.       */