diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | gc.c | 20 |
2 files changed, 16 insertions, 9 deletions
@@ -1,3 +1,8 @@ +Fri Dec 30 18:14:54 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * gc.c (garbage_collect): mark objects refered from aborting threads. + [ruby-dev:28190] + Fri Dec 30 14:24:53 2005 WATANABE Hirofumi <eban@ruby-lang.org> * dir.c (glob_helper): do not use TRUE for djgpp. @@ -1059,8 +1059,6 @@ gc_sweep() st_foreach(source_filenames, sweep_source_filename, 0); } - rb_gc_abort_threads(); - freelist = 0; final_list = deferred_final_list; deferred_final_list = 0; @@ -1404,14 +1402,18 @@ garbage_collect() rb_gc_mark_parser(); /* gc_mark objects whose marking are not completed*/ - while (!MARK_STACK_EMPTY){ - if (mark_stack_overflow){ - gc_mark_all(); - } - else { - gc_mark_rest(); + do { + while (!MARK_STACK_EMPTY) { + if (mark_stack_overflow){ + gc_mark_all(); + } + else { + gc_mark_rest(); + } } - } + rb_gc_abort_threads(); + } while (!MARK_STACK_EMPTY); + gc_sweep(); } |