ext/measure_gc_runs.h ext/measure_gc_time.h @@ -27,6 +27,10 @@ # (requires a patched Ruby interpreter). # memory - Tracks total memory size # (requires a patched Ruby interpreter). +# gc_runs - Tracks number of garbage collection runs +# (requires a patched Ruby interpreter). +# gc_time - Tracks time spent doing garbage collection +# (requires a patched Ruby interpreter). # --replace-progname Replace $0 when loading the .rb files. # --specialized-instruction Turn on specialized instruction. # -h, --help Show help message @@ -89,12 +93,15 @@ opts = OptionParser.new do |opts| end opts.on('--mode=measure_mode', - [:process, :wall, :cpu, :allocations], + [:process, :wall, :cpu, :allocations, :memory, :gc_runs, :gc_time], 'Select what ruby-prof should measure:', ' process - Process time (default).', ' wall - Wall time.', ' cpu - CPU time (Pentium and PowerPCs only).', - ' allocations - Object allocations (requires patched Ruby interpreter).') do |measure_mode| + ' allocations - Object allocations (requires patched Ruby interpreter).', + ' memory - Allocated memory in KB (requires patched Ruby interpreter).', + ' gc_runs - Number of garbage collections (requires patched Ruby interpreter).', + ' gc_time - Time spent in garbage collection (requires patched Ruby interpreter).') do |measure_mode| case measure_mode when :process @@ -107,6 +114,10 @@ opts = OptionParser.new do |opts| options.measure_mode = RubyProf::ALLOCATIONS when :memory options.measure_mode = RubyProf::MEMORY + when :gc_runs + options.measure_mode = RubyProf::GC_RUNS + when :gc_time + options.measure_mode = RubyProf::GC_TIME end end bin/ruby-prof @@ -16,9 +16,19 @@ else end have_header("sys/times.h") + +# Stefan Kaes / Alexander Dymo GC patch have_func("rb_os_allocated_objects") have_func("rb_gc_allocated_size") +have_func("rb_gc_collections") +have_func("rb_gc_time") + +# Lloyd Hilaiel's heap info patch +have_func("rb_heap_total_mem") +have_func("rb_gc_heap_info") + +# Ruby 1.9 unexposed methods have_func("rb_gc_malloc_allocations") have_func("rb_gc_malloc_allocated_size") -have_func("rb_heap_total_mem") + create_makefile("ruby_prof") ext/extconf.rb @@ -77,6 +77,8 @@ typedef unsigned long prof_measure_t; #include "measure_cpu_time.h" #include "measure_allocations.h" #include "measure_memory.h" +#include "measure_gc_runs.h" +#include "measure_gc_time.h" static prof_measure_t (*get_measurement)() = measure_process_time; static double (*convert_measurement)(prof_measure_t) = convert_process_time; @@ -1376,7 +1378,9 @@ prof_result_threads(VALUE self) *RubyProf::WALL_TIME - Measure wall time using gettimeofday on Linx and GetLocalTime on Windows *RubyProf::CPU_TIME - Measure time using the CPU clock counter. This mode is only supported on Pentium or PowerPC platforms. *RubyProf::ALLOCATIONS - Measure object allocations. This requires a patched Ruby interpreter. - *RubyProf::MEMORY - Measure memory size. This requires a patched Ruby interpreter.*/ + *RubyProf::MEMORY - Measure memory size. This requires a patched Ruby interpreter. + *RubyProf::GC_RUNS - Measure number of garbage collections. This requires a patched Ruby interpreter. + *RubyProf::GC_TIME - Measure time spent doing garbage collection. This requires a patched Ruby interpreter.*/ static VALUE prof_get_measure_mode(VALUE self) { @@ -1392,7 +1396,9 @@ prof_get_measure_mode(VALUE self) *RubyProf::WALL_TIME - Measure wall time using gettimeofday on Linx and GetLocalTime on Windows *RubyProf::CPU_TIME - Measure time using the CPU clock counter. This mode is only supported on Pentium or PowerPC platforms. *RubyProf::ALLOCATIONS - Measure object allocations. This requires a patched Ruby interpreter. - *RubyProf::MEMORY - Measure memory size. This requires a patched Ruby interpreter.*/ + *RubyProf::MEMORY - Measure memory size. This requires a patched Ruby interpreter. + *RubyProf::GC_RUNS - Measure number of garbage collections. This requires a patched Ruby interpreter. + *RubyProf::GC_TIME - Measure time spent doing garbage collection. This requires a patched Ruby interpreter.*/ static VALUE prof_set_measure_mode(VALUE self, VALUE val) { @@ -1436,7 +1442,21 @@ prof_set_measure_mode(VALUE self, VALUE val) convert_measurement = convert_memory; break; #endif - + + #if defined(MEASURE_GC_RUNS) + case MEASURE_GC_RUNS: + get_measurement = measure_gc_runs; + convert_measurement = convert_gc_runs; + break; + #endif + + #if defined(MEASURE_GC_TIME) + case MEASURE_GC_TIME: + get_measurement = measure_gc_time; + convert_measurement = convert_gc_time; + break; + #endif + default: rb_raise(rb_eArgError, "invalid mode: %d", mode); break; @@ -1642,7 +1662,21 @@ Init_ruby_prof() rb_define_const(mProf, "MEMORY", INT2NUM(MEASURE_MEMORY)); rb_define_singleton_method(mProf, "measure_memory", prof_measure_memory, 0); /* in measure_memory.h */ #endif - + + #ifndef MEASURE_GC_RUNS + rb_define_const(mProf, "GC_RUNS", Qnil); + #else + rb_define_const(mProf, "GC_RUNS", INT2NUM(MEASURE_GC_RUNS)); + rb_define_singleton_method(mProf, "measure_gc_runs", prof_measure_gc_runs, 0); /* in measure_gc_runs.h */ + #endif + + #ifndef MEASURE_GC_TIME + rb_define_const(mProf, "GC_TIME", Qnil); + #else + rb_define_const(mProf, "GC_TIME", INT2NUM(MEASURE_GC_TIME)); + rb_define_singleton_method(mProf, "measure_gc_time", prof_measure_gc_time, 0); /* in measure_gc_time.h */ + #endif + cResult = rb_define_class_under(mProf, "Result", rb_cObject); rb_undef_method(CLASS_OF(cMethodInfo), "new"); rb_define_method(cResult, "threads", prof_result_threads, 0); ext/ruby_prof.c @@ -27,8 +27,16 @@ module RubyProf when RubyProf.const_defined?(:MEMORY) && RubyProf::MEMORY @value_scale = 1 @output << 'memory' + when RubyProf.const_defined?(:GC_RUNS) && RubyProf::GC_RUNS + @value_scale = 1 + @output << 'gc_runs' + when RubyProf.const_defined?(:GC_TIME) && RubyProf::GC_TIME + @value_scale = 1000000 + @output << 'gc_time' + else + raise "Unknown measure mode: #{RubyProf.measure_mode}" end - @output << "\n\n" + @output << "\n\n" print_threads end lib/ruby-prof/call_tree_printer.rb @@ -17,7 +17,7 @@ class MeasurementTest < Test::Unit::TestCase assert_kind_of Float, t u = RubyProf.measure_process_time - assert u >= t, [t, u].inspect + assert u > t, [t, u].inspect end def test_wall_time @@ -36,7 +36,7 @@ class MeasurementTest < Test::Unit::TestCase assert_kind_of Float, t u = RubyProf.measure_cpu_time - assert u >= t, [t, u].inspect + assert u > t, [t, u].inspect end end @@ -46,7 +46,7 @@ class MeasurementTest < Test::Unit::TestCase assert_kind_of Integer, t u = RubyProf.measure_allocations - assert u >= t, [t, u].inspect + assert u > t, [t, u].inspect end end @@ -59,4 +59,28 @@ class MeasurementTest < Test::Unit::TestCase assert u >= t, [t, u].inspect end end + + if RubyProf::GC_RUNS + def test_gc_runs + t = RubyProf.measure_gc_runs + assert_kind_of Integer, t + + GC.start + + u = RubyProf.measure_gc_runs + assert u > t, [t, u].inspect + end + end + + if RubyProf::GC_TIME + def test_gc_time + t = RubyProf.measure_gc_time + assert_kind_of Integer, t + + GC.start + + u = RubyProf.measure_gc_time + assert u > t, [t, u].inspect + end + end end test/measurement_test.rb 1d63d1ead905eb47801fa1f06b8b507ee52a7167 bitsweat bitsweat@5fb4a865-4516-0410-ae3b-a609ddf12040 http://github.com/jeremy/ruby-prof/commit/c63ac38f13b58ab999cec24cf29b178246f9b97e c63ac38f13b58ab999cec24cf29b178246f9b97e 2008-06-28T00:58:55-07:00 2008-06-28T00:58:55-07:00 Add GC_RUNS and GC_TIME measure modes. git-svn-id: http://ruby-prof.rubyforge.org/svn@267 5fb4a865-4516-0410-ae3b-a609ddf12040 33b2518b686ebc7efe8ad65b2005d0a74afd5265 bitsweat bitsweat@5fb4a865-4516-0410-ae3b-a609ddf12040