kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* gc.c (garbage_collect): mark objects refered from aborting threads.

Browse source 
[ruby-dev:28190]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9771 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-12-30 09:15:56 +00:00
parent e052495637
commit cd5cd3c672
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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 15:17:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> Fri Dec 30 15:17:35 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
* lib/generator.rb: (Generator#initialize) ensured to stop @loop_thread. * lib/generator.rb: (Generator#initialize) ensured to stop @loop_thread.

20
gc.c
View file

@ -1017,8 +1017,6 @@ gc_sweep(void)
st_foreach(source_filenames, sweep_source_filename, 0); st_foreach(source_filenames, sweep_source_filename, 0);
} }
rb_gc_abort_threads();
freelist = 0; freelist = 0;
final_list = deferred_final_list; final_list = deferred_final_list;
deferred_final_list = 0; deferred_final_list = 0;
@ -1344,14 +1342,18 @@ garbage_collect(void)
rb_gc_mark_parser(); rb_gc_mark_parser();
/* gc_mark objects whose marking are not completed*/ /* gc_mark objects whose marking are not completed*/
while (!MARK_STACK_EMPTY){ do {
if (mark_stack_overflow){ while (!MARK_STACK_EMPTY) {
gc_mark_all(); if (mark_stack_overflow){
gc_mark_all();
}
else {
gc_mark_rest();
}
} }
else { rb_gc_abort_threads();
gc_mark_rest(); } while (!MARK_STACK_EMPTY);
}
}
gc_sweep(); gc_sweep();
return Qtrue; return Qtrue;