From b3da86e850c7944cf3c3f0292e9c8710f0eb0cf1 Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 9 Oct 2011 13:18:41 +0000 Subject: merges r33379 and r33395 from trunk into ruby_1_9_3. -- * gc.c (rb_gc_set_params): output GC parameter change messages only if -w/-v options are specified. these messages are output to stderr, not to stdout. [ruby-core:39795] [Bug #5380] * test/ruby/test_gc.rb (test_gc_parameter): add test for it. -- * gc.c (rb_gc_set_params): ruby_verbose can be Qnil, so use RTEST. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@33442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++++++++++ gc.c | 6 +++--- test/ruby/test_gc.rb | 2 ++ 3 files changed, 17 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 644d3ce1f1..3bcad8827c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Tue Oct 4 11:44:10 2011 NARUSE, Yui + + * gc.c (rb_gc_set_params): ruby_verbose can be Qnil, so use RTEST. + +Mon Oct 3 23:56:39 2011 CHIKANAGA Tomoyuki + + * gc.c (rb_gc_set_params): output GC parameter change messages only + if -w/-v options are specified. these messages are output to stderr, + not to stdout. [ruby-core:39795] [Bug #5380] + + * test/ruby/test_gc.rb (test_gc_parameter): add test for it. + Wed Sep 28 09:14:16 2011 Nobuyoshi Nakada <> * configure.in (pthread_np.h): needs pthread.h to be included diff --git a/gc.c b/gc.c index d1c0791a0c..3238d6580a 100644 --- a/gc.c +++ b/gc.c @@ -416,7 +416,7 @@ rb_gc_set_params(void) malloc_limit_ptr = getenv("RUBY_GC_MALLOC_LIMIT"); if (malloc_limit_ptr != NULL) { int malloc_limit_i = atoi(malloc_limit_ptr); - if (ruby_verbose) + if (RTEST(ruby_verbose)) fprintf(stderr, "malloc_limit=%d (%d)\n", malloc_limit_i, initial_malloc_limit); if (malloc_limit_i > 0) { @@ -427,7 +427,7 @@ rb_gc_set_params(void) heap_min_slots_ptr = getenv("RUBY_HEAP_MIN_SLOTS"); if (heap_min_slots_ptr != NULL) { int heap_min_slots_i = atoi(heap_min_slots_ptr); - if (ruby_verbose) + if (RTEST(ruby_verbose)) fprintf(stderr, "heap_min_slots=%d (%d)\n", heap_min_slots_i, initial_heap_min_slots); if (heap_min_slots_i > 0) { @@ -439,7 +439,7 @@ rb_gc_set_params(void) free_min_ptr = getenv("RUBY_FREE_MIN"); if (free_min_ptr != NULL) { int free_min_i = atoi(free_min_ptr); - if (ruby_verbose) + if (RTEST(ruby_verbose)) fprintf(stderr, "free_min=%d (%d)\n", free_min_i, initial_free_min); if (free_min_i > 0) { initial_free_min = free_min_i; diff --git a/test/ruby/test_gc.rb b/test/ruby/test_gc.rb index a0bc7f8b7f..bcc490626d 100644 --- a/test/ruby/test_gc.rb +++ b/test/ruby/test_gc.rb @@ -93,6 +93,8 @@ class TestGc < Test::Unit::TestCase "RUBY_HEAP_MIN_SLOTS" => "100000" } assert_in_out_err([env, "-e", "exit"], "", [], [], "[ruby-core:39795]") + assert_in_out_err([env, "-W0", "-e", "exit"], "", [], [], "[ruby-core:39795]") + assert_in_out_err([env, "-W1", "-e", "exit"], "", [], [], "[ruby-core:39795]") assert_in_out_err([env, "-w", "-e", "exit"], "", [], /heap_min_slots=100000/, "[ruby-core:39795]") end end -- cgit v1.2.3