diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-30 09:15:56 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-12-30 09:15:56 +0000 |
commit | cd5cd3c6729c4c7917f4c0c69a8c323763a69968 (patch) | |
tree | 025c691cdfc8ae6a65ae09e415bc28b6617b7ac2 /gc.c | |
parent | e0524956374b720c0c0f6c66853f56237150240b (diff) | |
download | ruby-cd5cd3c6729c4c7917f4c0c69a8c323763a69968.tar.gz |
* gc.c (garbage_collect): mark objects refered from aborting threads.
[ruby-dev:28190]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 20 |
1 files changed, 11 insertions, 9 deletions
@@ -1017,8 +1017,6 @@ gc_sweep(void) st_foreach(source_filenames, sweep_source_filename, 0); } - rb_gc_abort_threads(); - freelist = 0; final_list = deferred_final_list; deferred_final_list = 0; @@ -1344,14 +1342,18 @@ garbage_collect(void) 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(); return Qtrue; |