ruby-prof 0.12.1 → 0.12.2

data/ext/ruby_prof/extconf.rb

@@ -34,6 +34,10 @@ def add_define(name, value = nil)
   end
 end
 
+# if have_func("rb_gc_enable_stats")
+#   add_define("TOGGLE_GC_STATS", 1)
+# end
+
 require 'rubygems'
 unless Gem.win_platform? || RUBY_PLATFORM =~ /darwin/
   $LDFLAGS += " -lrt" # for clock_gettime
@@ -50,4 +54,4 @@ if RUBY_VERSION > "1.9"
   add_define("THREADS_INHERIT_EVENT_FLAGS", (threads.size == 2) ? "1" : "0")
 end
 
-create_makefile("ruby_prof")
+create_makefile("ruby_prof")

data/ext/ruby_prof/rp_call_info.c

@@ -48,7 +48,7 @@ static void
 prof_call_info_free(prof_call_info_t *call_info)
 {
 	prof_call_info_ruby_gc_free(call_info);
-	xfree(call_info->call_infos);
+	st_free_table(call_info->call_infos);
 	xfree(call_info);
 }
 

data/ext/ruby_prof/rp_measure_gc_time.c

@@ -17,16 +17,16 @@ measure_gc_time()
 {
 #if defined(HAVE_RB_GC_TIME)
 #define MEASURE_GC_TIME_ENABLED Qtrue
-    const int conversion = 1000000;
+    const double conversion = 1000000.0;
 #if HAVE_LONG_LONG
-    return NUM2LL(rb_gc_time() / conversion);
+    return NUM2LL(rb_gc_time()) / conversion;
 #else
-    return NUM2LONG(rb_gc_time() / conversion));
+    return NUM2LONG(rb_gc_time()) / conversion;
 #endif
 
 #else
 #define MEASURE_GC_TIME_ENABLED Qfalse
-    return 0;
+    return 0.0;
 #endif
 }
 
@@ -40,15 +40,11 @@ prof_measurer_t* prof_measurer_gc_time()
 /* call-seq:
    measure -> float
 
-Returns the number of GC runs.*/
+Returns the time spent performing GC.*/
 static VALUE
 prof_measure_gc_time(VALUE self)
 {
-#if defined(HAVE_LONG_LONG)
-    return ULL2NUM(measure_gc_time());
-#else
-    return ULONG2NUM(measure_gc_time());
-#endif
+    return rb_float_new(measure_gc_time());
 }
 
 void rp_init_measure_gc_time()

data/ext/ruby_prof/rp_measure_memory.c

@@ -25,7 +25,6 @@ static double
 measure_memory()
 {
 #if defined(HAVE_RB_GC_ALLOCATED_SIZE)
-#define TOGGLE_GC_STATS 1
 #define MEASURE_MEMORY_ENABLED Qtrue
 #if defined(HAVE_LONG_LONG)
     return NUM2LL(rb_gc_allocated_size()) / 1024.0;

data/ext/ruby_prof/rp_stack.c

@@ -84,11 +84,6 @@ prof_stack_pop(prof_stack_t *stack, double measurement)
 
   double total_time;
   double self_time;
-#ifdef _MSC_VER
-  BOOL frame_paused;
-#else
-  _Bool frame_paused;
-#endif
 
   /* Frame can be null.  This can happen if RubProf.start is called from
      a method that exits.  And it can happen if an exception is raised

data/ext/ruby_prof/vc/ruby_prof_18.vcxproj

@@ -44,14 +44,12 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

data/ext/ruby_prof/vc/ruby_prof_19.vcxproj

@@ -20,14 +20,12 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -55,7 +53,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;RUBY_PROF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\MinGW\local\ruby193vc\include\ruby-1.9.1;C:\MinGW\local\ruby193vc\include\ruby-1.9.1\i386-mswin32_110;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\MinGW\local\ruby193vc\include\ruby-1.9.1;C:\MinGW\local\ruby193vc\include\ruby-1.9.1\i386-mswin32_100;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

data/ext/ruby_prof/vc/ruby_prof_20.vcxproj

@@ -20,14 +20,12 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
-    <PlatformToolset>v110</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -55,7 +53,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;RUBY_PROF_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>C:\MinGW\local\ruby200vc\include\ruby-2.0.0;C:\MinGW\local\ruby200vc\include\ruby-2.0.0\i386-mswin32_110;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\MinGW\local\ruby200vc\include\ruby-2.0.0;C:\MinGW\local\ruby200vc\include\ruby-2.0.0\i386-mswin32_100;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

data/ext/ruby_prof/version.h

@@ -1,7 +1,7 @@
 /* Copyright (C) 2005-2013 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
    Please see the LICENSE file for copyright and distribution information */
 
-#define RUBY_PROF_VERSION  "0.12.1" // as a string, for easy parsing from rake files
+#define RUBY_PROF_VERSION  "0.12.2" // as a string, for easy parsing from rake files
 #define RUBY_PROF_VERSION_MAJ   0
 #define RUBY_PROF_VERSION_MIN   12
-#define RUBY_PROF_VERSION_MIC   1
+#define RUBY_PROF_VERSION_MIC   2

data/lib/ruby-prof/compatibility.rb

@@ -152,13 +152,18 @@ private
 
   # for GC.allocated_size to work GC statistics should be enabled
   def self.enable_gc_stats_if_needed
-    if self.measure_mode == RubyProf::MEMORY && GC.respond_to?(:enable_stats)
+    if measure_mode_requires_gc_stats_enabled?
       @gc_stat_was_enabled = GC.enable_stats
     end
   end
 
   def self.disable_gc_stats_if_needed(was_enabled=nil)
     was_enabled ||= defined?(@gc_stat_was_enabled) && @gc_stat_was_enabled
-    GC.disable_stats if self.measure_mode == RubyProf::MEMORY && GC.respond_to?(:disable_stats) && !was_enabled
+    GC.disable_stats if measure_mode_requires_gc_stats_enabled? && !was_enabled
   end
-end
+
+  def self.measure_mode_requires_gc_stats_enabled?
+    GC.respond_to?(:enable_stats) &&
+      [RubyProf::MEMORY, RubyProf::GC_TIME, RubyProf::GC_RUNS].include?(measure_mode)
+  end
+end

data/ruby-prof.gemspec

@@ -57,4 +57,5 @@ EOF
   spec.homepage = 'https://github.com/rdp/ruby-prof'
   spec.add_development_dependency('minitest')
   spec.add_development_dependency('rake-compiler')
-end
+  spec.add_development_dependency('rdoc')
+end

data/test/dynamic_method_test.rb

@@ -17,7 +17,7 @@ class DynamicMethodTest < Test::Unit::TestCase
     # Methods called
     #  Kernel#sleep
     #  <Class::BasicObject>#allocate
-    #  #{RubyProf.parent_object}
+    #  #{RubyProf.parent_object}#inizialize
     #  RubyProf::C1#hello
     #  Class#new
     #  Integer#times
@@ -52,6 +52,13 @@ class DynamicMethodTest < Test::Unit::TestCase
     assert_in_delta(0.0, methods[4].wait_time, 0.01)
     assert_in_delta(0.0, methods[4].self_time, 0.01)
 
+    # the timing difference between #initialize and #allocate is so small
+    # that we cannot rely on #initialize appearing first.
+    # so switch them, if necessary
+    if methods[5].full_name =~ /#allocate/
+      methods[5], methods[6] = methods[6], methods[5]
+    end
+
     assert_equal("#{RubyProf.parent_object}#initialize", methods[5].full_name)
     assert_in_delta(0.0, methods[5].total_time, 0.01)
     assert_in_delta(0.0, methods[5].wait_time, 0.01)

data/test/measure_gc_runs_test.rb

@@ -3,7 +3,9 @@
 
 require File.expand_path('../test_helper', __FILE__)
 
-class MeasuremeGCRunsTest < Test::Unit::TestCase
+class MeasureGCRunsTest < Test::Unit::TestCase
+  include MemoryTestHelper
+
   def test_gc_runs_mode
     RubyProf::measure_mode = RubyProf::GC_RUNS
     assert_equal(RubyProf::GC_RUNS, RubyProf::measure_mode)
@@ -18,6 +20,7 @@ class MeasuremeGCRunsTest < Test::Unit::TestCase
       t = RubyProf.measure_gc_runs
       assert_kind_of Integer, t
 
+      GC.enable_stats
       GC.start
 
       u = RubyProf.measure_gc_runs

data/test/measure_gc_time_test.rb

@@ -4,6 +4,8 @@
 require File.expand_path('../test_helper', __FILE__)
 
 class MeasureGCTimeTest < Test::Unit::TestCase
+  include MemoryTestHelper
+
   def test_gc_time_mode
     RubyProf::measure_mode = RubyProf::GC_TIME
     assert_equal(RubyProf::GC_TIME, RubyProf::measure_mode)
@@ -15,15 +17,20 @@ class MeasureGCTimeTest < Test::Unit::TestCase
 
   if RubyProf::GC_TIME_ENABLED
     def test_gc_time
+      RubyProf::measure_mode = RubyProf::GC_TIME
+      RubyProf.enable_gc_stats_if_needed
+
       t = RubyProf.measure_gc_time
-      assert_kind_of Integer, t
+      assert_kind_of Float, t
 
       GC.start
 
       u = RubyProf.measure_gc_time
       assert u > t, [t, u].inspect
-      RubyProf::measure_mode = RubyProf::GC_TIME
+
       memory_test_helper
+    ensure
+      RubyProf.disable_gc_stats_if_needed
     end
   end
-end
+end

data/test/measure_memory_test.rb

@@ -4,12 +4,7 @@
 require File.expand_path('../test_helper', __FILE__)
 
 class MeasureMemoryTest < Test::Unit::TestCase
-  def memory_test_helper
-    result = RubyProf.profile {Array.new}
-    total = result.threads.values.first.inject(0) { |sum, m| sum + m.total_time }
-    assert(total < 1_000_000, 'Total should not have subtract overflow error')
-    total
-  end
+  include MemoryTestHelper
 
   def test_memory_mode
     RubyProf::measure_mode = RubyProf::MEMORY
@@ -23,10 +18,10 @@ class MeasureMemoryTest < Test::Unit::TestCase
   if RubyProf::MEMORY_ENABLED
     def test_memory
       t = RubyProf.measure_memory
-      assert_kind_of Integer, t
+      assert_kind_of Float, t
 
       u = RubyProf.measure_memory
-      assert(u >= t, [t, u].inspect)
+      assert(u > t, [t, u].inspect)
       RubyProf::measure_mode = RubyProf::MEMORY
       total = memory_test_helper
       assert(total > 0, 'Should measure more than zero kilobytes of memory usage')

data/test/measure_process_time_test.rb

@@ -10,7 +10,6 @@ class MeasureProcessTimeTest < Test::Unit::TestCase
   end
 
   def test_mode
-    RubyProf::measure_mode = RubyProf::PROCESS_TIME
     assert_equal(RubyProf::PROCESS_TIME, RubyProf::measure_mode)
   end
 
@@ -28,11 +27,18 @@ class MeasureProcessTimeTest < Test::Unit::TestCase
     total_time = (finish.utime - start.utime) + (finish.stime - start.stime)
 
     thread = result.threads.first
-    assert_in_delta(total_time, thread.total_time, 0.01)
+    assert_in_delta(total_time, thread.total_time, 0.03)
 
     methods = result.threads.first.methods.sort.reverse
 
-    assert_equal(RubyProf.ruby_2? ? 15 : 16, methods.length)
+    if RUBY_VERSION =~ /^1\.8/
+      methods.reject!{|m| m.full_name =~ /^Fixnum/ || m.full_name == 'Object#find_largest'}
+    end
+    if RUBY_VERSION =~ /^(1\.9\.2|2\.0)/
+      assert_equal 15, methods.length
+    else
+      assert_equal 16, methods.length
+    end
 
     # Check times
     assert_equal("MeasureProcessTimeTest#test_primes", methods[0].full_name)
@@ -53,4 +59,4 @@ class MeasureProcessTimeTest < Test::Unit::TestCase
     assert_equal("Array#each_index", methods[7].full_name)
     assert_equal("Kernel#rand", methods[8].full_name)
   end
-end
+end

data/test/method_elimination_test.rb

@@ -2,7 +2,6 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'tmpdir'
 
 # Test data
 #     A
@@ -35,7 +34,7 @@ class MethodEliminationTest < Test::Unit::TestCase
     result = RubyProf.profile do
       1000.times { 1+1 }
     end
-    method_infos = result.threads.first.methods
+    method_infos = result.threads.first.methods.sort.reverse
     assert(m1 = method_infos[0])
     assert(c1 = m1.call_infos.first)
     assert_nil(c1.parent)

data/test/multi_printer_test.rb

@@ -2,7 +2,6 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
-require 'tmpdir'
 
 # Test data
 #     A
@@ -50,20 +49,20 @@ class MultiPrinterTest < Test::Unit::TestCase
 \s*</tr>
 \s*
 \s*<tr>
-\s*<td><a href="#\d+">\d+</a></td>
+\s*<td><a href="#-?\d+">-?\d+</a></td>
 \s*<td>([\.0-9]+)</td>
 \s*</tr>
 \s*
 \s*</table>')
-    assert graph =~ re
+    assert_match(re, graph)
     display_time = $1.to_f
-    assert_in_delta expected_time, display_time, 0.005
+    assert_in_delta expected_time, display_time, 0.5
   end
 
   private
   def print(result)
     test = caller.first =~ /in `(.*)'/ ? $1 : "test"
-    path = Dir::tmpdir
+    path = RubyProf.tmpdir
     profile = "ruby_prof_#{test}"
     printer = RubyProf::MultiPrinter.new(result)
     printer.print(:path => path, :profile => profile,
@@ -75,6 +74,6 @@ class MultiPrinterTest < Test::Unit::TestCase
       GC.start
       GC.dump_file_and_line_info("heap.dump")
     end
-    [File.open(printer.stack_profile){|f|f.read}, File.open(printer.graph_profile){|f|f.read}]
+    [File.read(printer.stack_profile), File.read(printer.graph_profile)]
   end
 end

data/test/pause_resume_test.rb

@@ -31,6 +31,10 @@ class PauseResumeTest < Test::Unit::TestCase
     #   Kernel#sleep
 
     methods = result.threads.first.methods.sort_by {|method_info| method_info.full_name}
+    # remove methods called by pause/resume
+    called_methods = ['Array#include?', 'Fixnum#==', 'Kernel#respond_to?', 'Kernel#respond_to_missing?']
+    methods.reject!{|m| called_methods.include?(m.full_name) }
+    # TODO: fix pause/resume to not include those methods in the first place
     assert_equal(3, methods.length)
 
     # Check the names
@@ -56,15 +60,12 @@ class PauseResumeTest < Test::Unit::TestCase
   def test_pause_resume_1
     profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
 
-    # Measured
     profile.start
     method_1a
 
-    # Not measured
     profile.pause
     method_1b
 
-    # Measured
     profile.resume
     method_1c
 
@@ -79,11 +80,9 @@ class PauseResumeTest < Test::Unit::TestCase
   def test_pause_resume_2
     profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
 
-    # Measured
     profile.start
     method_2a
 
-    # Not Measured
     profile.pause
     sleep 0.5
     method_2b(profile)
@@ -98,11 +97,10 @@ class PauseResumeTest < Test::Unit::TestCase
   def test_pause_resume_3
     profile = RubyProf::Profile.new(RubyProf::WALL_TIME,[])
 
-    # Measured
     profile.start
     method_3a(profile)
-    sleep 0.5
 
+    sleep 0.5
     profile.resume
     method_3b
 
@@ -165,4 +163,4 @@ class PauseResumeTest < Test::Unit::TestCase
     profile.resume; assert !profile.paused?
     profile.stop  ; assert !profile.paused?
   end
-end
+end