archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-23 21:14:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

* gc.c: introduce new environment variable

Browse source 
"RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" to control major/minor GC
  frequency.
  Do full GC when the number of old objects is more than R * N
  where R is this factor and
                N is the number of old objects just after last full GC.
* test/ruby/test_gc.rb: add a test.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45021 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2014-02-17 03:27:13 +00:00
parent 1492277e3c
commit 3ee0444955
3 changed files with 38 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Mon Feb 17 12:09:52 2014 Koichi Sasada <ko1@atdot.net>
* gc.c: introduce new environment variable
"RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" to control major/minor GC
frequency.
Do full GC when the number of old objects is more than R * N
where R is this factor and
N is the number of old objects just after last full GC.
* test/ruby/test_gc.rb: add a test.
Mon Feb 17 11:28:40 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> Mon Feb 17 11:28:40 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* test/test_pty.rb: ignore warnings to unused variables. * test/test_pty.rb: ignore warnings to unused variables.

20
gc.c
View file

@ -108,6 +108,9 @@ rb_gc_guarded_ptr(volatile VALUE *ptr)
#ifndef GC_HEAP_GROWTH_MAX_SLOTS #ifndef GC_HEAP_GROWTH_MAX_SLOTS
#define GC_HEAP_GROWTH_MAX_SLOTS 0 /* 0 is disable */ #define GC_HEAP_GROWTH_MAX_SLOTS 0 /* 0 is disable */
#endif #endif
#ifndef GC_HEAP_OLDOBJECT_LIMIT_FACTOR
#define GC_HEAP_OLDOBJECT_LIMIT_FACTOR 2.0
#endif
#ifndef GC_MALLOC_LIMIT_MIN #ifndef GC_MALLOC_LIMIT_MIN
#define GC_MALLOC_LIMIT_MIN (16 * 1024 * 1024 /* 16MB */) #define GC_MALLOC_LIMIT_MIN (16 * 1024 * 1024 /* 16MB */)
@ -134,6 +137,7 @@ typedef struct {
size_t heap_free_slots; size_t heap_free_slots;
double growth_factor; double growth_factor;
size_t growth_max_slots; size_t growth_max_slots;
double oldobject_limit_factor;
size_t malloc_limit_min; size_t malloc_limit_min;
size_t malloc_limit_max; size_t malloc_limit_max;
double malloc_limit_growth_factor; double malloc_limit_growth_factor;
@ -150,6 +154,7 @@ static ruby_gc_params_t gc_params = {
GC_HEAP_INIT_SLOTS, GC_HEAP_INIT_SLOTS,
GC_HEAP_GROWTH_FACTOR, GC_HEAP_GROWTH_FACTOR,
GC_HEAP_GROWTH_MAX_SLOTS, GC_HEAP_GROWTH_MAX_SLOTS,
GC_HEAP_OLDOBJECT_LIMIT_FACTOR,
GC_MALLOC_LIMIT_MIN, GC_MALLOC_LIMIT_MIN,
GC_MALLOC_LIMIT_MAX, GC_MALLOC_LIMIT_MAX,
GC_MALLOC_LIMIT_GROWTH_FACTOR, GC_MALLOC_LIMIT_GROWTH_FACTOR,
@ -4513,10 +4518,12 @@ gc_marks(rb_objspace_t *objspace, int full_mark)
#endif #endif
gc_marks_body(objspace, TRUE); gc_marks_body(objspace, TRUE);
{
/* Do full GC if old/remembered_shady object counts is greater than counts two times at last full GC counts */ /* See the comment about RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR */
objspace->rgengc.remembered_shady_object_limit = objspace->rgengc.remembered_shady_object_count * 2; const double r = gc_params.oldobject_limit_factor;
objspace->rgengc.old_object_limit = objspace->rgengc.old_object_count * 2; objspace->rgengc.remembered_shady_object_limit = objspace->rgengc.remembered_shady_object_count * r;
objspace->rgengc.old_object_limit = objspace->rgengc.old_object_count * r;
}
} }
else { /* minor GC */ else { /* minor GC */
gc_marks_body(objspace, FALSE); gc_marks_body(objspace, FALSE);
@ -5764,6 +5771,10 @@ gc_set_initial_pages(void)
* - (next slots number) = (current slots number) * (this factor) * - (next slots number) = (current slots number) * (this factor)
* * RUBY_GC_HEAP_GROWTH_MAX_SLOTS (new from 2.1) * * RUBY_GC_HEAP_GROWTH_MAX_SLOTS (new from 2.1)
* - Allocation rate is limited to this factor. * - Allocation rate is limited to this factor.
* * RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR (new from 2.1.1)
* - Do full GC when the number of old objects is more than R * N
* where R is this factor and
* N is the number of old objects just after last full GC.
* *
* * obsolete * * obsolete
* * RUBY_FREE_MIN -> RUBY_GC_HEAP_FREE_SLOTS (from 2.1) * * RUBY_FREE_MIN -> RUBY_GC_HEAP_FREE_SLOTS (from 2.1)
@ -5802,6 +5813,7 @@ ruby_gc_set_params(int safe_level)
get_envparam_double("RUBY_GC_HEAP_GROWTH_FACTOR", &gc_params.growth_factor, 1.0); get_envparam_double("RUBY_GC_HEAP_GROWTH_FACTOR", &gc_params.growth_factor, 1.0);
get_envparam_size ("RUBY_GC_HEAP_GROWTH_MAX_SLOTS", &gc_params.growth_max_slots, 0); get_envparam_size ("RUBY_GC_HEAP_GROWTH_MAX_SLOTS", &gc_params.growth_max_slots, 0);
get_envparam_double("RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR", &gc_params.oldobject_limit_factor, 0.0);
get_envparam_size ("RUBY_GC_MALLOC_LIMIT", &gc_params.malloc_limit_min, 0); get_envparam_size ("RUBY_GC_MALLOC_LIMIT", &gc_params.malloc_limit_min, 0);
get_envparam_size ("RUBY_GC_MALLOC_LIMIT_MAX", &gc_params.malloc_limit_max, 0); get_envparam_size ("RUBY_GC_MALLOC_LIMIT_MAX", &gc_params.malloc_limit_max, 0);

10
test/ruby/test_gc.rb
View file

@ -177,6 +177,16 @@ class TestGc < Test::Unit::TestCase
assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_HEAP_GROWTH_FACTOR=2.0/, "") assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_HEAP_GROWTH_FACTOR=2.0/, "")
assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_HEAP_GROWTH_MAX_SLOTS=10000/, "[ruby-core:57928]") assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_HEAP_GROWTH_MAX_SLOTS=10000/, "[ruby-core:57928]")
env = {
"RUBY_GC_HEAP_INIT_SLOTS" => "100000",
"RUBY_GC_HEAP_FREE_SLOTS" => "10000",
"RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR" => "0.9",
}
assert_normal_exit("exit", "", :child_env => env)
assert_in_out_err([env, "-w", "-e", "exit"], "", [], /RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR=0\.9/, "")
# always full GC when RUBY_GC_HEAP_OLDOBJECT_LIMIT_FACTOR < 1.0
assert_in_out_err([env, "-e", "1000_000.times{Object.new}; p(GC.stat[:minor_gc_count] < GC.stat[:major_gc_count])"], "", ['true'], [], "")
# check obsolete # check obsolete
assert_in_out_err([{'RUBY_FREE_MIN' => '100'}, '-w', '-eexit'], '', [], assert_in_out_err([{'RUBY_FREE_MIN' => '100'}, '-w', '-eexit'], '', [],
/RUBY_FREE_MIN is obsolete. Use RUBY_GC_HEAP_FREE_SLOTS instead/) /RUBY_FREE_MIN is obsolete. Use RUBY_GC_HEAP_FREE_SLOTS instead/)