Changeset 12869 in project

Timestamp:

12/22/08 10:02:39 (12 years ago)

Author:

felix winkelmann

Message:

finalizer bug not fixed, perhaps now

Location:

chicken/trunk

Files:

• runtime.c (modified) (4 diffs)
• tests/test-finalizers.scm (modified) (2 diffs)

chicken/trunk/runtime.c

@@ -2707 +2707 @@
       mark(&gcrp->value);
 
+    /* mark finalizer procedures: */
+    for(flist = finalizer_list; flist != NULL; flist = flist->next) 
+      mark(&flist->finalizer);
+
     mark_system_globals();
   }
@@ -2771 +2775 @@
         for(flist = finalizer_list; flist != NULL; flist = flist->next) {
           mark(&flist->item);
-          mark(&flist->finalizer);
           ++fcount;
         }
@@ -2781 +2784 @@
         j = fcount = 0;
 
-        for(flist = finalizer_list; flist != NULL; flist = flist->next) 
-          mark(&flist->finalizer);
-
         for(flist = finalizer_list; flist != NULL; flist = flist->next) {
           if(j < C_max_pending_finalizers) {
@@ -2798 +2798 @@
 
       if(pending_finalizer_count > 0 && gc_report_flag)
-        C_printf(C_text("[GC] finalizers pending for rescan: %d (%d live)\n"), 
+        C_printf(C_text("[GC] finalizers pending: %d (%d live)\n"), 
                  pending_finalizer_count, live_finalizer_count);
 

chicken/trunk/tests/test-finalizers.scm

@@ -10 +10 @@
    x
    (lambda (o)
-     (format #t "Delete: ~A~%" o)
+     (format #t "Delete: ~A (y: ~a)~%" o y-f)
      (set! x-f #t)))
   #t) 
@@ -26 +26 @@
 (set! x #f)
 (gc #t)
-(assert x-f)
+(assert (not x-f))
 (assert (not y-f))
 (set! y #f)
 (gc #t)
+(assert y-f)
 (assert x-f)