diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gc.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_gc.rb | 11 |
3 files changed, 20 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Thu Nov 19 21:55:11 2015 Koichi Sasada <ko1@atdot.net> + + * gc.c (gc_start): force to invoke GC by GC.start + even if it is GC.disable'd. + + * test/ruby/test_gc.rb: add a test. + Thu Nov 19 20:08:59 2015 Koichi Sasada <ko1@atdot.net> * gc.c: trivial performance improvements. @@ -6158,8 +6158,8 @@ gc_start(rb_objspace_t *objspace, const int full_mark, const int immediate_mark, int do_full_mark = full_mark; objspace->flags.immediate_sweep = immediate_sweep; - if (!heap_allocated_pages) return FALSE; /* heap is not ready */ - if (!ready_to_gc(objspace)) return TRUE; /* GC is not allowed */ + if (!heap_allocated_pages) return FALSE; /* heap is not ready */ + if (reason != GPR_FLAG_METHOD && !ready_to_gc(objspace)) return TRUE; /* GC is not allowed */ if (RGENGC_CHECK_MODE) { assert(objspace->flags.stat == gc_stat_none); diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index 0ed592b285..ff0696bce5 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -385,4 +385,15 @@ class TestGc < Test::Unit::TestCase C.new end; end + + def test_gc_disabled_start + begin + disabled = GC.disable + c = GC.count + GC.start + assert_equal 1, GC.count - c + ensure + GC.enable unless disabled + end + end end |