* gc.c (chain_finalized_object): deletes finalizers to be invoked from

  finalizer_table.

* gc.c (rb_gc_call_finalizer_at_exit): warns when could not invoke
  finalizers.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@18394 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 15 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 7bf76395c..3297fcc34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Wed Aug  6 21:25:45 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* gc.c (chain_finalized_object): deletes finalizers to be invoked from
+	  finalizer_table.
+
+	* gc.c (rb_gc_call_finalizer_at_exit): warns when could not invoke
+	  finalizers.
+
 Wed Aug  6 20:56:43 2008  Tanaka Akira  <akr@fsij.org>
 
 	* enc/depend: transcode table generation depends on
diff --git a/gc.c b/gc.c
index 6c9666585..120b396d5 100644
--- a/gc.c
+++ b/gc.c
@@ -2092,6 +2092,7 @@ chain_finalized_object(st_data_t key, st_data_t val, st_data_t arg)
 	}
 	p->as.free.next = *final_list;
 	*final_list = p;
+	return ST_DELETE;
     }
     return ST_CONTINUE;
 }
@@ -2113,6 +2114,12 @@ rb_gc_call_finalizer_at_exit(void)
 	    st_foreach(finalizer_table, chain_finalized_object,
 		       (st_data_t)&deferred_final_list);
 	} while (deferred_final_list);
+	if (finalizer_table->num_entries) {
+	    rb_warning("%d finalizer%s left not-invoked due to self-reference",
+		       finalizer_table->num_entries,
+		       finalizer_table->num_entries > 1 ? "s" : "");
+	}
+	st_free_table(finalizer_table);
     }
     /* finalizers are part of garbage collection */
     during_gc++;