2011-05-11 Ivan Maidanski <ivmai@mail.ru>

	* pthread_support.c (GC_check_tls): Fix "#endif" comment.
	* include/gc.h (GC_REDIRECT_TO_LOCAL): Remove deprecated comment.
	* include/private/thread_local_alloc.h (THREAD_LOCAL_ALLOC):
	Remove redundant test of the macro.
	* include/private/thread_local_alloc.h: Reformat the code.

diff --git a/ChangeLog b/ChangeLog
index 1ccedb2..7d87f5b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-11  Ivan Maidanski  <ivmai@mail.ru>
 
+       * pthread_support.c (GC_check_tls): Fix "#endif" comment.
+       * include/gc.h (GC_REDIRECT_TO_LOCAL): Remove deprecated comment.
+       * include/private/thread_local_alloc.h (THREAD_LOCAL_ALLOC):
+       Remove redundant test of the macro.
+       * include/private/thread_local_alloc.h: Reformat the code.
+
+2011-05-11  Ivan Maidanski  <ivmai@mail.ru>
+
        * backgraph.c (add_edge): Recognize DEBUG_PRINT_BIG_N_EDGES macro.
        * os_dep.c (GC_set_and_save_fault_handler): Recognize
        SIGACTION_FLAGS_NODEFER_HACK macro.

diff --git a/include/gc.h b/include/gc.h
index 8c996cb..3e3f56e 100644 (file)
--- a/include/gc.h
+++ b/include/gc.h
@@ -1443,11 +1443,6 @@ GC_API void GC_CALL GC_win32_free_heap(void);
 # include "gc_amiga_redirects.h"
 #endif
 
-  /*
-   * GC_REDIRECT_TO_LOCAL is now redundant;
-   * that's the default with THREAD_LOCAL_ALLOC.
-   */
-
 #ifdef __cplusplus
   }  /* end of extern "C" */
 #endif

diff --git a/include/private/thread_local_alloc.h b/include/private/thread_local_alloc.h
index b36fffd..258b592 100644 (file)
--- a/include/private/thread_local_alloc.h
+++ b/include/private/thread_local_alloc.h
@@ -24,108 +24,104 @@
 
 #include "private/gc_priv.h"
 
-#if defined(THREAD_LOCAL_ALLOC)
+#ifdef THREAD_LOCAL_ALLOC
 
 #include "gc_inline.h"
 
-# if defined(USE_HPUX_TLS)
-#   error USE_HPUX_TLS macro was replaced by USE_COMPILER_TLS
-# endif
+#if defined(USE_HPUX_TLS)
+# error USE_HPUX_TLS macro was replaced by USE_COMPILER_TLS
+#endif
 
-# if !defined(USE_PTHREAD_SPECIFIC) && !defined(USE_WIN32_SPECIFIC) && \
-     !defined(USE_WIN32_COMPILER_TLS) && !defined(USE_COMPILER_TLS) && \
-     !defined(USE_CUSTOM_SPECIFIC)
-#   if defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32)
-#     if defined(__GNUC__)  /* Fixed for versions past 2.95? */ \
-         || defined(MSWINCE)
-#       define USE_WIN32_SPECIFIC
-#     else
-#       define USE_WIN32_COMPILER_TLS
-#     endif /* !GNU */
-#   elif defined(LINUX) && !defined(ARM32) && !defined(AVR32) && \
-                 (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >=3))
-#     define USE_COMPILER_TLS
-#   elif (defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) || \
-         defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS)) || \
-         defined(GC_NETBSD_THREADS)
-#     define USE_PTHREAD_SPECIFIC
-#   elif defined(GC_HPUX_THREADS)
-#     ifdef __GNUC__
-#      define USE_PTHREAD_SPECIFIC
-         /* Empirically, as of gcc 3.3, USE_COMPILER_TLS doesn't work.  */
-#     else
-#      define USE_COMPILER_TLS
-#     endif
+#if !defined(USE_PTHREAD_SPECIFIC) && !defined(USE_WIN32_SPECIFIC) \
+    && !defined(USE_WIN32_COMPILER_TLS) && !defined(USE_COMPILER_TLS) \
+    && !defined(USE_CUSTOM_SPECIFIC)
+# if defined(MSWIN32) || defined(MSWINCE) || defined(CYGWIN32)
+#   if defined(__GNUC__) /* Fixed for versions past 2.95? */ \
+       || defined(MSWINCE)
+#     define USE_WIN32_SPECIFIC
 #   else
-#     define USE_CUSTOM_SPECIFIC  /* Use our own.       */
+#     define USE_WIN32_COMPILER_TLS
+#   endif /* !GNU */
+# elif defined(LINUX) && !defined(ARM32) && !defined(AVR32) \
+       && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >=3))
+#   define USE_COMPILER_TLS
+# elif defined(GC_DGUX386_THREADS) || defined(GC_OSF1_THREADS) \
+       || defined(GC_DARWIN_THREADS) || defined(GC_AIX_THREADS) \
+       || defined(GC_NETBSD_THREADS)
+#   define USE_PTHREAD_SPECIFIC
+# elif defined(GC_HPUX_THREADS)
+#   ifdef __GNUC__
+#    define USE_PTHREAD_SPECIFIC
+     /* Empirically, as of gcc 3.3, USE_COMPILER_TLS doesn't work.      */
+#   else
+#    define USE_COMPILER_TLS
 #   endif
+# else
+#   define USE_CUSTOM_SPECIFIC  /* Use our own. */
 # endif
+#endif
 
-# include <stdlib.h>
+#include <stdlib.h>
 
 /* One of these should be declared as the tlfs field in the     */
 /* structure pointed to by a GC_thread.                         */
 typedef struct thread_local_freelists {
-#   ifdef THREAD_LOCAL_ALLOC
-        void * ptrfree_freelists[TINY_FREELISTS];
-        void * normal_freelists[TINY_FREELISTS];
-#       ifdef GC_GCJ_SUPPORT
-          void * gcj_freelists[TINY_FREELISTS];
-#         define ERROR_FL ((void *)(word)-1)
-                /* Value used for gcj_freelist[-1]; allocation is       */
-                /* erroneous.                                           */
-#       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/GRANULE_BYTES)
-                /* Don't use local free lists for up to this much       */
-                /* allocation.                                          */
-
-#   endif
+  void * ptrfree_freelists[TINY_FREELISTS];
+  void * normal_freelists[TINY_FREELISTS];
+# ifdef GC_GCJ_SUPPORT
+    void * gcj_freelists[TINY_FREELISTS];
+#   define ERROR_FL ((void *)(word)-1)
+        /* Value used for gcj_freelist[-1]; allocation is       */
+        /* erroneous.                                           */
+# 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/GRANULE_BYTES)
+        /* Don't use local free lists for up to this much       */
+        /* allocation.                                          */
 } *GC_tlfs;
 
-# if defined(USE_PTHREAD_SPECIFIC)
-#   define GC_getspecific pthread_getspecific
-#   define GC_setspecific pthread_setspecific
-#   define GC_key_create pthread_key_create
-    typedef pthread_key_t GC_key_t;
-# elif defined(USE_COMPILER_TLS) || defined(USE_WIN32_COMPILER_TLS)
-#   define GC_getspecific(x) (x)
-#   define GC_setspecific(key, v) ((key) = (v), 0)
-#   define GC_key_create(key, d) 0
-    typedef void * GC_key_t;
-# elif defined(USE_WIN32_SPECIFIC)
-#   ifndef WIN32_LEAN_AND_MEAN
-#     define WIN32_LEAN_AND_MEAN 1
-#   endif
-#   define NOSERVICE
-#   include <windows.h>
-#   define GC_getspecific TlsGetValue
-#   define GC_setspecific(key, v) !TlsSetValue(key, v)
+#if defined(USE_PTHREAD_SPECIFIC)
+# define GC_getspecific pthread_getspecific
+# define GC_setspecific pthread_setspecific
+# define GC_key_create pthread_key_create
+  typedef pthread_key_t GC_key_t;
+#elif defined(USE_COMPILER_TLS) || defined(USE_WIN32_COMPILER_TLS)
+# define GC_getspecific(x) (x)
+# define GC_setspecific(key, v) ((key) = (v), 0)
+# define GC_key_create(key, d) 0
+  typedef void * GC_key_t;
+#elif defined(USE_WIN32_SPECIFIC)
+# ifndef WIN32_LEAN_AND_MEAN
+#   define WIN32_LEAN_AND_MEAN 1
+# endif
+# define NOSERVICE
+# include <windows.h>
+# define GC_getspecific TlsGetValue
+# define GC_setspecific(key, v) !TlsSetValue(key, v)
         /* We assume 0 == success, msft does the opposite.      */
-#   ifndef TLS_OUT_OF_INDEXES
-      /* this is currently missing in WinCE */
-#     define TLS_OUT_OF_INDEXES (DWORD)0xFFFFFFFF
-#   endif
-#   define GC_key_create(key, d) \
-        ((d) != 0 || (*(key) = TlsAlloc()) == TLS_OUT_OF_INDEXES ? -1 : 0)
-        /* Need TlsFree on process exit/detach ? */
-    typedef DWORD GC_key_t;
-# elif defined(USE_CUSTOM_SPECIFIC)
-#   include "private/specific.h"
-# else
-#   error implement me
+# ifndef TLS_OUT_OF_INDEXES
+        /* this is currently missing in WinCE   */
+#   define TLS_OUT_OF_INDEXES (DWORD)0xFFFFFFFF
 # endif
-
+# define GC_key_create(key, d) \
+        ((d) != 0 || (*(key) = TlsAlloc()) == TLS_OUT_OF_INDEXES ? -1 : 0)
+        /* Need TlsFree on process exit/detach?   */
+  typedef DWORD GC_key_t;
+#elif defined(USE_CUSTOM_SPECIFIC)
+# include "private/specific.h"
+#else
+# error implement me
+#endif
 
 /* Each thread structure must be initialized.   */
 /* This call must be made from the new thread.  */

diff --git a/pthread_support.c b/pthread_support.c
index 8caaee0..3a3f667 100644 (file)
--- a/pthread_support.c
+++ b/pthread_support.c
@@ -288,12 +288,12 @@ STATIC long GC_nprocs = 1;
                         /* a guess as any ...                           */
 
 #ifdef THREAD_LOCAL_ALLOC
-/* We must explicitly mark ptrfree and gcj free lists, since the free   */
-/* list links wouldn't otherwise be found.  We also set them in the     */
-/* normal free lists, since that involves touching less memory than if  */
-/* we scanned them normally.                                            */
-GC_INNER void GC_mark_thread_local_free_lists(void)
-{
+  /* We must explicitly mark ptrfree and gcj free lists, since the free */
+  /* list links wouldn't otherwise be found.  We also set them in the   */
+  /* normal free lists, since that involves touching less memory than   */
+  /* if we scanned them normally.                                       */
+  GC_INNER void GC_mark_thread_local_free_lists(void)
+  {
     int i;
     GC_thread p;
 
@@ -303,9 +303,9 @@ GC_INNER void GC_mark_thread_local_free_lists(void)
           GC_mark_thread_local_fls_for(&(p->tlfs));
       }
     }
-}
+  }
 
-#if defined(GC_ASSERTIONS)
+# if defined(GC_ASSERTIONS)
     void GC_check_tls_for(GC_tlfs p);
 #   if defined(USE_CUSTOM_SPECIFIC)
       void GC_check_tsd_marks(tsd *key);
@@ -328,9 +328,8 @@ GC_INNER void GC_mark_thread_local_free_lists(void)
             GC_check_tsd_marks(GC_thread_key);
 #       endif
     }
-#endif /* GC_ASSERTIONS */
-
-#endif /* Thread_local_alloc */
+# endif /* GC_ASSERTIONS */
+#endif /* THREAD_LOCAL_ALLOC */
 
 #ifdef PARALLEL_MARK
 
@@ -456,7 +455,7 @@ void GC_push_thread_structures(void)
     GC_push_all((ptr_t)(GC_threads), (ptr_t)(GC_threads)+sizeof(GC_threads));
 #   if defined(THREAD_LOCAL_ALLOC)
       GC_push_all((ptr_t)(&GC_thread_key),
-          (ptr_t)(&GC_thread_key)+sizeof(&GC_thread_key));
+                  (ptr_t)(&GC_thread_key) + sizeof(&GC_thread_key));
 #   endif
 }
 
@@ -615,7 +614,7 @@ GC_INNER unsigned char *GC_check_finalizer_nested(void)
     /* thread_local_alloc.c) checks only that it's close.               */
     return((char *)tsd > me && (char *)tsd < me + 1000);
   }
-#endif
+#endif /* GC_ASSERTIONS && THREAD_LOCAL_ALLOC */
 
 #ifdef HANDLE_FORK
 /* Remove all entries from the GC_threads table, except the     */
@@ -640,7 +639,7 @@ STATIC void GC_remove_all_threads_but_me(void)
             if (!(p -> flags & FINISHED)) {
               GC_destroy_thread_local(&(p->tlfs));
             }
-#         endif /* THREAD_LOCAL_ALLOC */
+#         endif
           if (p != &first_thread) GC_INTERNAL_FREE(p);
         }
       }
@@ -1440,7 +1439,7 @@ GC_INNER GC_thread GC_start_rtn_prepare_thread(void *(**pstart)(void *),
     me = GC_register_my_thread_inner(sb, self);
     me -> flags = si -> flags;
 #   if defined(THREAD_LOCAL_ALLOC)
-        GC_init_thread_local(&(me->tlfs));
+      GC_init_thread_local(&(me->tlfs));
 #   endif
     UNLOCK();
     *pstart = si -> start_routine;