ruby-prof 0.10.6 → 0.10.7

data/CHANGES

@@ -1,3 +1,11 @@
+0.10.7
+======================
+Fix a bug with REE's GC stats. Issue #53 [thanks graaff]
+
+0.10.6
+======================
+Slightly more normalized url for linux/windows links to files.
+
 0.10.5
 =======================
 1.8.6 compat for -v command (bug fix)

data/ext/ruby_prof/ruby_prof.c

@@ -1078,10 +1078,8 @@ pop_frames(st_data_t key, st_data_t value, st_data_t now_arg)
 }
 
 static void
-prof_pop_threads()
+prof_pop_threads(prof_measure_t now)
 {
-    /* Get current measurement */
-    prof_measure_t now = get_measurement();
     st_foreach(threads_tbl, pop_frames, (st_data_t) &now);
 }
 
@@ -1613,6 +1611,10 @@ prof_resume(VALUE self)
 static VALUE
 prof_stop(VALUE self)
 {
+    /* get 'now' before prof emove hook because it calls GC.disable_stats
+      which makes the call within prof_pop_threads of now return 0, which is wrong
+    */
+    prof_measure_t now = get_measurement();
     if (threads_tbl == NULL)
     {
         rb_raise(rb_eRuntimeError, "RubyProf.start was not yet called");
@@ -1626,10 +1628,10 @@ prof_stop(VALUE self)
         fclose(trace_file);
       trace_file = NULL;
     }
-
+    
     prof_remove_hook();
 
-    prof_pop_threads();
+    prof_pop_threads(now);
 
     /* Create the result */
     result = prof_result_new();

data/ext/ruby_prof/version.h

@@ -1,4 +1,4 @@
-#define RUBY_PROF_VERSION  "0.10.6" // for easy parsing from rake files
+#define RUBY_PROF_VERSION  "0.10.7" // for easy parsing from rake files
 #define RUBY_PROF_VERSION_MAJ   0
 #define RUBY_PROF_VERSION_MIN   10
-#define RUBY_PROF_VERSION_MIC   6
+#define RUBY_PROF_VERSION_MIC   7

data/test/go.rb

@@ -0,0 +1,33 @@
+#!/usr/bin/env ruby
+require 'test/unit'
+require 'ruby-prof'
+
+class MeasurementTest < Test::Unit::TestCase
+
+  if RubyProf::MEMORY
+    def test_memory_mode
+      RubyProf::measure_mode = RubyProf::MEMORY
+      assert_equal(RubyProf::MEMORY, RubyProf::measure_mode)
+    end
+
+    def test_memory
+      t = RubyProf.measure_memory
+      assert_kind_of Integer, t
+
+      u = RubyProf.measure_memory
+      assert(u >= t, [t, u].inspect)
+
+      RubyProf::measure_mode = RubyProf::MEMORY
+      result = RubyProf.profile {Array.new}
+require 'rubygems'
+require 'ruby-debug'
+#debugger
+      total = result.threads.values.first.inject(0) { |sum, m| sum + m.total_time }
+      
+
+      assert(total > 0, 'Should measure more than zero kilobytes of memory usage')
+      p total
+      assert_not_equal(0, total % 1, 'Should not truncate fractional kilobyte measurements')
+    end
+  end
+end

data/test/measurement_test.rb

@@ -4,10 +4,12 @@ require 'ruby-prof'
 
 class MeasurementTest < Test::Unit::TestCase
   def setup
+    # also done in C these days...
     GC.enable_stats if GC.respond_to?(:enable_stats)
   end
 
   def teardown
+    # also done in C for normal runs...
     GC.disable_stats if GC.respond_to?(:disable_stats)
   end
 
@@ -69,6 +71,13 @@ class MeasurementTest < Test::Unit::TestCase
     end
   end
 
+  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
+
   if RubyProf::MEMORY
     def test_memory_mode
       RubyProf::measure_mode = RubyProf::MEMORY
@@ -81,11 +90,8 @@ class MeasurementTest < Test::Unit::TestCase
 
       u = RubyProf.measure_memory
       assert(u >= t, [t, u].inspect)
-
       RubyProf::measure_mode = RubyProf::MEMORY
-      result = RubyProf.profile {Array.new}
-      total = result.threads.values.first.inject(0) { |sum, m| sum + m.total_time }
-
+      total = memory_test_helper
       assert(total > 0, 'Should measure more than zero kilobytes of memory usage')
       assert_not_equal(0, total % 1, 'Should not truncate fractional kilobyte measurements')
     end
@@ -105,6 +111,8 @@ class MeasurementTest < Test::Unit::TestCase
 
       u = RubyProf.measure_gc_runs
       assert u > t, [t, u].inspect
+      RubyProf::measure_mode = RubyProf::GC_RUNS
+      memory_test_helper
     end
   end
 
@@ -117,6 +125,8 @@ class MeasurementTest < Test::Unit::TestCase
 
       u = RubyProf.measure_gc_time
       assert u > t, [t, u].inspect
+      RubyProf::measure_mode = RubyProf::GC_TIME
+      memory_test_helper
     end
   end
 end

data/test/stack_printer_test.rb

@@ -46,7 +46,7 @@ class StackPrinterTest < Test::Unit::TestCase
     assert file_contents =~ /Thread: (\d+) \(100\.00% ~ ([.0-9]+)\)/
     actual_time = $2.to_f
     difference = (expected_time-actual_time).abs
-    assert difference < 0.01 # less than 1 ms
+    assert_in_delta(expected_time, actual_time, 0.01)
   end
 
   def test_method_elimination

data/test/thread_test.rb

@@ -155,7 +155,7 @@ class ThreadTest < Test::Unit::TestCase
                 a.join
                 b.join
         end
-        assert result.threads.values.flatten.sort[-1].total_time < 10 # 10s
+        assert result.threads.values.flatten.sort[-1].total_time < 10 # 10s. Amazingly, this can fail in OS X at times. Amazing.
   end
 
   def test_thread

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-prof
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 10
-  - 6
-  version: 0.10.6
+  - 7
+  version: 0.10.7
 platform: ruby
 authors: 
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
@@ -15,7 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-29 00:00:00 Z
+date: 2011-05-09 00:00:00 -06:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: os
@@ -125,6 +126,7 @@ files:
 - test/exceptions_test.rb
 - test/exclude_threads_test.rb
 - test/exec_test.rb
+- test/go.rb
 - test/line_number_test.rb
 - test/measurement_test.rb
 - test/method_elimination_test.rb
@@ -144,6 +146,7 @@ files:
 - test/thread_test.rb
 - test/unique_call_path_test.rb
 - ext/ruby_prof/extconf.rb
+has_rdoc: true
 homepage: http://rubyforge.org/projects/ruby-prof/
 licenses: []
 
@@ -175,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ruby-prof
-rubygems_version: 1.7.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Fast Ruby profiler