diff options
author | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-08 10:26:50 +0000 |
---|---|---|
committer | kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-08 10:26:50 +0000 |
commit | 0accf1fbeced2530d2428b750a3c37e797c1745a (patch) | |
tree | 3361aaf3e1dfb7dece61932041f666b40a59276d /gc.c | |
parent | cc2394638044c083269037aeb133e17b14a896ac (diff) |
merge revision(s) 33368:
* gc.c (add_heap_slots, init_heap): reset heaps_inc zero when
heap slots are expanded by environment variable RUBY_HEAP_MIN_SLOTS.
[ruby-core:39777] [Bug #5380]
* test/ruby/test_gc.rb (test_gc_parameter): add test for it.
* test/ruby/envutil.rb (assert_normal_exit): add :child_env option to
enable pass environemnt variables to child process.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33432 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1079,6 +1079,7 @@ add_heap_slots(rb_objspace_t *objspace, size_t add) for (i = 0; i < add; i++) { assign_heap_slot(objspace); } + heaps_inc = 0; } static void @@ -1095,7 +1096,6 @@ init_heap(rb_objspace_t *objspace) } #endif - heaps_inc = 0; objspace->profile.invoke_time = getrusage_time(); finalizer_table = st_init_numtable(); } |