diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-09 13:18:41 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-10-09 13:18:41 +0000 |
commit | b3da86e850c7944cf3c3f0292e9c8710f0eb0cf1 (patch) | |
tree | 1a944b3ad1fc320396a63cac5cd3114e4041f725 /gc.c | |
parent | b9762ef2962dc75df99efafc5c3f674359ad428d (diff) |
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
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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; |