ruby-prof 0.7.6 → 0.7.7

data/lib/ruby-prof/flat_printer.rb

@@ -37,7 +37,7 @@ module RubyProf
     
     def print_methods(thread_id, methods)
       # Get total time
-      toplevel = methods.sort.last
+      toplevel = methods.max
       total_time = toplevel.total_time
       if total_time == 0
         total_time = 0.01

data/lib/ruby-prof/graph_html_printer.rb

@@ -62,7 +62,7 @@ module RubyProf
       # Cache thread times since this is an expensive
       # operation with the required sorting      
       @result.threads.each do |thread_id, methods|
-        top = methods.sort.last
+        top = methods.max
         
         thread_time = 0.01
         thread_time = top.total_time if top.total_time > 0

data/lib/ruby-prof/graph_printer.rb

@@ -36,7 +36,7 @@ module RubyProf
       # Cache thread times since this is an expensive
       # operation with the required sorting      
       @result.threads.each do |thread_id, methods|
-        top = methods.sort.last
+        top = methods.max
         
         thread_time = 0.01
         thread_time = top.total_time if top.total_time > 0

data/lib/ruby-prof/method_info.rb

@@ -57,7 +57,7 @@ module RubyProf
     end
 
     def min_depth
-      call_infos.map do |call_info|
+      @min_depth ||= call_infos.map do |call_info|
         call_info.depth
       end.min
     end

data/lib/ruby-prof/test.rb

@@ -82,7 +82,7 @@ module RubyProf
 
       data = RubyProf.stop
       bench = data.threads.values.inject(0) do |total, method_infos|
-        top = method_infos.sort.last
+        top = method_infos.max
         total += top.total_time
         total
       end

data/test/aggregate_test.rb

@@ -88,7 +88,7 @@ class AggregateTest < Test::Unit::TestCase
     assert_equal('AggClass#a', call_info.parent.target.full_name)
     assert_in_delta(3, call_info.total_time, 0.05)
     assert_in_delta(0, call_info.wait_time, 0.01)
-    assert_in_delta(0, call_info.self_time, 0.01)
+    assert_in_delta(0, call_info.self_time, 0.05)
     assert_in_delta(3, call_info.children_time, 0.05)
     assert_equal(3, call_info.called)
   end

data/test/basic_test.rb

@@ -137,14 +137,14 @@ class BasicTest < Test::Unit::TestCase
 
     methods = result.threads.values.first.sort.reverse
     assert_equal(6, methods.length)
-
-    assert_equal('BasicTest#test_instance_methods', methods[0].full_name)
-    assert_equal('C1#hello', methods[1].full_name)
-    assert_equal('Kernel#sleep', methods[2].full_name)
-    assert_equal('Class#new', methods[3].full_name)
-    
-    assert_equal("<Class::#{PARENT}>#allocate", methods[4].full_name)
-    assert_equal("#{PARENT}#initialize", methods[5].full_name)
+    names = methods.map &:full_name
+    assert_equal('BasicTest#test_instance_methods', names[0])
+    assert_equal('C1#hello', names[1])
+    assert_equal('Kernel#sleep', names[2])
+    assert_equal('Class#new', names[3])
+    # order can differ
+    assert(names.include?("<Class::#{PARENT}>#allocate"))
+    assert(names.include?("#{PARENT}#initialize"))
 
     # Check times
     assert_in_delta(0.2, methods[0].total_time, 0.02)
@@ -190,17 +190,17 @@ class BasicTest < Test::Unit::TestCase
     assert_equal('Kernel#sleep', methods[2].full_name)
 
     # Check times
-    assert_in_delta(0.3, methods[0].total_time, 0.02)
-    assert_in_delta(0, methods[0].wait_time, 0.01)
-    assert_in_delta(0, methods[0].self_time, 0.01)
+    assert_in_delta(0.3, methods[0].total_time, 0.1)
+    assert_in_delta(0, methods[0].wait_time, 0.02)
+    assert_in_delta(0, methods[0].self_time, 0.02)
 
-    assert_in_delta(0.3, methods[1].total_time, 0.02)
-    assert_in_delta(0, methods[1].wait_time, 0.01)
-    assert_in_delta(0, methods[1].self_time, 0.01)
+    assert_in_delta(0.3, methods[1].total_time, 0.1)
+    assert_in_delta(0, methods[1].wait_time, 0.02)
+    assert_in_delta(0, methods[1].self_time, 0.02)
 
-    assert_in_delta(0.3, methods[2].total_time, 0.02)
-    assert_in_delta(0, methods[2].wait_time, 0.01)
-    assert_in_delta(0.3, methods[2].self_time, 0.02)
+    assert_in_delta(0.3, methods[2].total_time, 0.1)
+    assert_in_delta(0, methods[2].wait_time, 0.02)
+    assert_in_delta(0.3, methods[2].self_time, 0.1)
   end
 
   def test_module_instance_methods
@@ -218,18 +218,18 @@ class BasicTest < Test::Unit::TestCase
 
     methods = result.threads.values.first.sort.reverse
     assert_equal(6, methods.length)
-
-    assert_equal('BasicTest#test_module_instance_methods', methods[0].full_name)
-    assert_equal('M1#hello', methods[1].full_name)
-    assert_equal('Kernel#sleep', methods[2].full_name)
-    assert_equal('Class#new', methods[3].full_name)
-    assert_equal("<Class::#{PARENT}>#allocate", methods[4].full_name)
-    assert_equal("#{PARENT}#initialize", methods[5].full_name)
+    names = methods.map &:full_name 
+    assert_equal('BasicTest#test_module_instance_methods', names[0])
+    assert_equal('M1#hello', names[1])
+    assert_equal('Kernel#sleep', names[2])
+    assert_equal('Class#new', names[3])
+    assert(names.include?("<Class::#{PARENT}>#allocate"))
+    assert(names.include?("#{PARENT}#initialize"))
     
     # Check times
-    assert_in_delta(0.3, methods[0].total_time, 0.02)
-    assert_in_delta(0, methods[0].wait_time, 0.02)
-    assert_in_delta(0, methods[0].self_time, 0.01)
+    assert_in_delta(0.3, methods[0].total_time, 0.1)
+    assert_in_delta(0, methods[0].wait_time, 0.1)
+    assert_in_delta(0, methods[0].self_time, 0.1)
 
     assert_in_delta(0.3, methods[1].total_time, 0.02)
     assert_in_delta(0, methods[1].wait_time, 0.01)
@@ -287,4 +287,4 @@ class BasicTest < Test::Unit::TestCase
 
     RubyProf.stop
   end
-end
+end

data/test/current_failures_windows

@@ -1,20 +1,8 @@
 1.8 passes, 1.9 however...
 
-
   1) Failure:
-test_thread_count(ThreadTest) [E:/dev/ruby/ruby-prof/test/thread_test.rb:22]:
-<2> expected but was
-<1>.
-
-  2) Failure:
-test_thread_identity(ThreadTest) [E:/dev/ruby/ruby-prof/test/thread_test.rb:37]:
-<2> expected but was
-<1>.
-
-  3) Failure:
-test_thread_timings(ThreadTest) [E:/dev/ruby/ruby-prof/test/thread_test.rb:58]:
-<2> expected but was
-<1>.
+test_thread_timings(ThreadTest) [E:/dev/ruby/ruby-prof/test/thread_test.rb:76]:
+Expected 0 - 1.0 (1.0) to be < 0.01.
 
-43 tests, 390 assertions, 3 failures, 0 errors, 0 skips
-rake aborted!
+43 tests, 410 assertions, 1 failures, 0 errors, 0 skips
+rake aborted!

data/test/recursive_test.rb

@@ -181,8 +181,8 @@ class RecursiveTest < Test::Unit::TestCase
     assert_equal('Object#sub_cycle', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(2, method.total_time, 0.05)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
+    assert_in_delta(0, method.self_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(2, method.children_time, 0.05)
 
     assert_equal(1, method.call_infos.length)
@@ -198,7 +198,7 @@ class RecursiveTest < Test::Unit::TestCase
     assert_equal('Kernel#sleep', method.full_name)
     assert_equal(2, method.called)
     assert_in_delta(2, method.total_time, 0.05)
-    assert_in_delta(2, method.self_time, 0.01)
+    assert_in_delta(2, method.self_time, 0.05)
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(0, method.children_time, 0.01)
 

data/test/stack_test.rb

@@ -53,10 +53,10 @@ class StackTest < Test::Unit::TestCase
     method = methods[0]
     assert_equal('StackTest#test_call_sequence', method.full_name)
     assert_equal(1, method.called)
-    assert_in_delta(8, method.total_time, 0.05)
+    assert_in_delta(8, method.total_time, 0.25)
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(8, method.children_time, 0.05)
+    assert_in_delta(8, method.children_time, 0.25)
     assert_equal(1, method.call_infos.length)
 
     call_info = method.call_infos[0]
@@ -83,7 +83,7 @@ class StackTest < Test::Unit::TestCase
     assert_equal(4, method.called)
     assert_in_delta(8, method.total_time, 0.05)
     assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(8, method.self_time, 0.01)
+    assert_in_delta(8, method.self_time, 0.05)
     assert_in_delta(0, method.children_time, 0.05)
     assert_equal(4, method.call_infos.length)
 
@@ -135,4 +135,4 @@ class StackTest < Test::Unit::TestCase
     assert_equal('StackTest#test_call_sequence->StackClass#a->StackClass#c->StackClass#b', call_info.call_sequence)
     assert_equal(1, call_info.children.length)
   end
-end
+end

data/test/start_stop_test.rb

@@ -43,10 +43,10 @@ class StartStopTest < Test::Unit::TestCase
     method = methods[0]
     assert_equal('StartStopTest#method1', method.full_name)
     assert_equal(1, method.called)
-    assert_in_delta(2, method.total_time, 0.01)
+    assert_in_delta(2, method.total_time, 0.05)
     assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(2, method.children_time, 0.01)
+    assert_in_delta(2, method.children_time, 0.05)
     assert_equal(1, method.call_infos.length)
 
     call_info = method.call_infos[0]

data/test/thread_test.rb

@@ -21,29 +21,27 @@ class ThreadTest < Test::Unit::TestCase
     result = RubyProf.stop
     assert_equal(2, result.threads.keys.length) # this should pass...
   end
-
+  
   def test_thread_identity
     RubyProf.start
-
     thread = Thread.new do
-      sleep(1)
+      sleep(1)    
     end
-
     thread.join
     result = RubyProf.stop
 
     thread_ids = result.threads.keys.sort
-    threads = [Thread.current, thread].sort_by {|th| th.object_id}
+    threads = [Thread.current, thread]
     assert_equal(2, thread_ids.length) # should pass
 
-    assert_equal(threads[0].object_id, thread_ids[0])
-    assert_equal(threads[1].object_id, thread_ids[1])
-
+    assert(thread_ids.include?(threads[0].object_id))
+    assert(thread_ids.include?(threads[1].object_id))
+    
     assert_instance_of(Thread, ObjectSpace._id2ref(thread_ids[0]))
-    assert_equal(threads[0], ObjectSpace._id2ref(thread_ids[0]))
+    assert(threads.include? (ObjectSpace._id2ref(thread_ids[0])))
 
     assert_instance_of(Thread, ObjectSpace._id2ref(thread_ids[1]))
-    assert_equal(threads[1], ObjectSpace._id2ref(thread_ids[1]))
+    assert(threads.include?(ObjectSpace._id2ref(thread_ids[1])))
   end
 
   def test_thread_timings
@@ -64,7 +62,7 @@ class ThreadTest < Test::Unit::TestCase
     assert_equal(1, method.called)
     assert_in_delta(1, method.total_time, 0.05)
     assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01) # this fails
+    assert_in_delta(0, method.wait_time, 0.01)
     assert_in_delta(1, method.children_time, 0.01)
     assert_equal(1, method.call_infos.length)
     call_info = method.call_infos[0]
@@ -159,4 +157,4 @@ class ThreadTest < Test::Unit::TestCase
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-prof
 version: !ruby/object:Gem::Version 
-  version: 0.7.6
+  version: 0.7.7
 platform: ruby
 authors: 
 - Shugo Maeda and Charlie Savage
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-31 00:00:00 -07:00
+date: 2010-01-13 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -53,6 +53,8 @@ files:
 - ext/mingw/build.rake
 - ext/vc/ruby_prof.sln
 - ext/vc/ruby_prof.vcproj
+- lib/out_18
+- lib/out_19
 - lib/ruby-prof/abstract_printer.rb
 - lib/ruby-prof/aggregate_call_info.rb
 - lib/ruby-prof/call_info.rb
@@ -65,8 +67,6 @@ files:
 - lib/ruby-prof/task.rb
 - lib/ruby-prof/test.rb
 - lib/ruby-prof.rb
-- lib/test.rb
-- lib/test2.rb
 - lib/unprof.rb
 - rails/environment/profile.rb
 - rails/example/example_test.rb

data/lib/test.rb

@@ -1,6 +0,0 @@
-require 'ruby-prof'
-
-RubyProf.start
-loop {
- Thread.new { sleep 1 }
-}

data/lib/test2.rb

@@ -1,4 +0,0 @@
-def go
- 3
-end
-go