1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* gc.c (rb_newobj): force garbage_collect() if GC.stress == true.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29690 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2010-11-04 12:06:08 +00:00
parent be4eee217c
commit 71603f3f01
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu Nov 4 20:04:44 2010 Koichi Sasada <ko1@atdot.net>
* gc.c (rb_newobj): force garbage_collect() if GC.stress == true.
Thu Nov 4 19:48:22 2010 Koichi Sasada <ko1@atdot.net> Thu Nov 4 19:48:22 2010 Koichi Sasada <ko1@atdot.net>
* ChangeLog: missed to write a last ChangeLog. * ChangeLog: missed to write a last ChangeLog.

34
gc.c
View File

@ -1042,12 +1042,26 @@ rb_during_gc(void)
#define RANY(o) ((RVALUE*)(o)) #define RANY(o) ((RVALUE*)(o))
static VALUE VALUE
rb_newobj_from_heap(rb_objspace_t *objspace) rb_newobj(void)
{ {
rb_objspace_t *objspace = &rb_objspace;
VALUE obj; VALUE obj;
if ((ruby_gc_stress && !ruby_disable_gc_stress) || !freelist) { if (UNLIKELY(during_gc)) {
dont_gc = 1;
during_gc = 0;
rb_bug("object allocation during garbage collection phase");
}
if (UNLIKELY(ruby_gc_stress) && UNLIKELY(!ruby_disable_gc_stress)) {
if (!garbage_collect(objspace)) {
during_gc = 0;
rb_memerror();
}
}
if (UNLIKELY(!freelist)) {
if (!gc_lazy_sweep(objspace)) { if (!gc_lazy_sweep(objspace)) {
during_gc = 0; during_gc = 0;
rb_memerror(); rb_memerror();
@ -1067,20 +1081,6 @@ rb_newobj_from_heap(rb_objspace_t *objspace)
return obj; return obj;
} }
VALUE
rb_newobj(void)
{
rb_objspace_t *objspace = &rb_objspace;
if (during_gc) {
dont_gc = 1;
during_gc = 0;
rb_bug("object allocation during garbage collection phase");
}
return rb_newobj_from_heap(objspace);
}
NODE* NODE*
rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2) rb_node_newnode(enum node_type type, VALUE a0, VALUE a1, VALUE a2)
{ {