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 (allocate_heaps, assign_heap_slot, rb_newobj_from_heap):

Browse source 
reset during_gc before raising NoMemoryError.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18307 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2008-08-01 12:36:39 +00:00
parent 893009f8b8
commit 57b9e18d71
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Fri Aug 1 21:36:00 2008 Yusuke Endoh <mame@tsg.ne.jp>
* gc.c (allocate_heaps, assign_heap_slot, rb_newobj_from_heap):
reset during_gc before raising NoMemoryError.
Fri Aug 1 21:29:56 2008 Yusuke Endoh <mame@tsg.ne.jp>
* vm.c (Init_BareVM): check failure of malloc().

10
gc.c
View file

@ -555,7 +555,10 @@ allocate_heaps(rb_objspace_t *objspace, size_t next_heaps_length)
p = heaps = (struct heaps_slot *)malloc(size);
}
);
if (p == 0) rb_memerror();
if (p == 0) {
during_gc = 0;
rb_memerror();
}
heaps_length = next_heaps_length;
}
@ -568,8 +571,10 @@ assign_heap_slot(rb_objspace_t *objspace)
objs = HEAP_OBJ_LIMIT;
RUBY_CRITICAL(p = (RVALUE*)malloc(HEAP_SIZE));
if (p == 0)
if (p == 0) {
during_gc = 0;
rb_memerror();
}
membase = p;
if ((VALUE)p % sizeof(RVALUE) != 0) {
@ -663,6 +668,7 @@ rb_newobj_from_heap(rb_objspace_t *objspace)
if ((ruby_gc_stress && !ruby_disable_gc_stress) || !freelist) {
if (!heaps_increment(objspace) && !garbage_collect(objspace)) {
during_gc = 0;
rb_memerror();
}
}