Code refactoring of GC_check_tls_for/GC_check_fl_marks

(Apply commit e67ab08 from 'master' branch)

* alloc.c (GC_check_fl_marks): Change prototype (pass pointer to
"freelist" element instead of value); do not define the function if
THREAD_LOCAL_ALLOC undefined.
* include/private/gc_priv.h (GC_check_fl_marks): Likewise.
* alloc.c (GC_check_fl_marks): Skip check if the argument points to
a special (non-pointer) value; update comment; rename "q" local
variable to "list".
* thread_local_alloc.c (GC_check_tls_for): Update code according to
GC_check_fl_marks functionality change (remove checks for special
value).

diff --git a/alloc.c b/alloc.c
index a41cb1db05b1507f3b50cfa472829691d4e694ea..7b52656c0adb79b585e0076810e3103ccc0b4b64 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -716,20 +716,24 @@ GC_INNER void GC_set_fl_marks(ptr_t q)
    }
 }
 
-#ifdef GC_ASSERTIONS
-  /* Check that all mark bits for the free list whose first entry is q  */
-  /* are set.                                                           */
-  void GC_check_fl_marks(ptr_t q)
+#if defined(GC_ASSERTIONS) && defined(THREADS) && defined(THREAD_LOCAL_ALLOC)
+  /* Check that all mark bits for the free list whose first entry is    */
+  /* (*pfreelist) are set.  Check skipped if points to a special value. */
+  void GC_check_fl_marks(void **pfreelist)
   {
-   ptr_t p;
-   for (p = q; p != 0; p = obj_link(p)) {
+    ptr_t list = *pfreelist;
+    ptr_t p;
+
+    if ((word)list <= HBLKSIZE) return;
+
+    for (p = list; p != 0; p = obj_link(p)) {
        if (!GC_is_marked(p)) {
-           GC_err_printf("Unmarked object %p on list %p\n", p, q);
+           GC_err_printf("Unmarked object %p on list %p\n", p, list);
            ABORT("Unmarked local free list entry");
        }
-   }
+    }
   }
-#endif
+#endif /* GC_ASSERTIONS && THREAD_LOCAL_ALLOC */
 
 /* Clear all mark bits for the free list whose first entry is q */
 /* Decrement GC_bytes_found by number of bytes on free list.    */

diff --git a/include/private/gc_priv.h b/include/private/gc_priv.h
index 43e7f26edbdd45c15421ce04f46d00327887ccfb..8eefb70e1bc79b22aeae75d1dd3809c02335e2d4 100644 (file)
--- a/include/private/gc_priv.h
+++ b/include/private/gc_priv.h
@@ -1508,8 +1508,8 @@ GC_INNER void GC_set_hdr_marks(hdr * hhdr);
 GC_INNER void GC_set_fl_marks(ptr_t p);
                                     /* Set all mark bits associated with */
                                     /* a free list.                      */
-#ifdef GC_ASSERTIONS
-  void GC_check_fl_marks(ptr_t p);
+#if defined(GC_ASSERTIONS) && defined(THREADS) && defined(THREAD_LOCAL_ALLOC)
+  void GC_check_fl_marks(void **);
                                     /* Check that all mark bits         */
                                     /* associated with a free list are  */
                                     /* set.  Abort if not.              */

diff --git a/thread_local_alloc.c b/thread_local_alloc.c
index 0a49b94df06f2d65eaa1850ad8e5a7236cc93f8c..0a5029b994c55b10bce8df0e012aaacb5a8fa464 100644 (file)
--- a/thread_local_alloc.c
+++ b/thread_local_alloc.c
@@ -291,18 +291,14 @@ GC_INNER void GC_mark_thread_local_fls_for(GC_tlfs p)
     /* Check that all thread-local free-lists in p are completely marked. */
     void GC_check_tls_for(GC_tlfs p)
     {
-        ptr_t q;
         int j;
 
         for (j = 1; j < TINY_FREELISTS; ++j) {
-          q = p -> ptrfree_freelists[j];
-          if ((word)q > HBLKSIZE) GC_check_fl_marks(q);
-          q = p -> normal_freelists[j];
-          if ((word)q > HBLKSIZE) GC_check_fl_marks(q);
+          GC_check_fl_marks(&p->ptrfree_freelists[j]);
+          GC_check_fl_marks(&p->normal_freelists[j]);
 #         ifdef GC_GCJ_SUPPORT
-            q = p -> gcj_freelists[j];
-            if ((word)q > HBLKSIZE) GC_check_fl_marks(q);
-#         endif /* GC_GCJ_SUPPORT */
+            GC_check_fl_marks(&p->gcj_freelists[j]);
+#         endif
         }
     }
 #endif /* GC_ASSERTIONS */