ruby-prof 0.4.0 → 0.4.1

data/lib/ruby-prof/graph_html_printer.rb

@@ -168,8 +168,9 @@ module RubyProf
 					<th>Name</th>
 				</tr>
 
-				<% methods = methods.values.sort.reverse %>
-				<% for method in methods %>
+				<% methods.sort.reverse.each do |pair| %>
+	        <% name = pair[0] %>
+  	      <% method = pair[1] %>
 					<% method_total_percent = self.total_percent(method) %>
 					<% next if method_total_percent < @min_percent %>
 					<% method_self_percent = self.self_percent(method) %>

data/lib/ruby-prof/graph_printer.rb

@@ -63,11 +63,10 @@ module RubyProf
       
       print_heading(thread_id)
     
-      # Get methods and sort by time
-      methods = methods.values.sort.reverse
-    
       # Print each method
-      methods.each do |method|
+      methods.sort.reverse.each do |pair|
+        name = pair[0]
+        method = pair[1]
         total_percentage = (method.total_time/total_time) * 100
         self_percentage = (method.self_time/total_time) * 100
         
@@ -84,7 +83,7 @@ module RubyProf
         @output << sprintf("%#{TIME_WIDTH}.2f", method.self_time)
         @output << sprintf("%#{TIME_WIDTH}.2f", method.children_time)
         @output << sprintf("%#{CALL_WIDTH}i", method.called)
-        @output << sprintf("     %s", method.name)
+        @output << sprintf("     %s", name)
         @output << "\n"
     
         print_children(thread_id, method)

data/test/basic_test.rb

@@ -1,141 +1,148 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'ruby-prof'
-require 'test_helper'
-
-class C1
-  def C1.hello
-  end
-  
-  def hello
-  end
-end
-
-module M1
-  def hello
-  end
-end
-
-class C2
-  include M1
-  extend M1
-end
-
-class C3
-  def hello
-  end
-end
-
-module M4
-  def hello
-  end
-end
-
-module M5
-  include M4
-  def goodbye
-    hello
-  end
-end
-
-class C6
-  include M5
-  def test
-    goodbye
-  end
-end
-
-class BasicTest < Test::Unit::TestCase
-  def test_double_profile
-    RubyProf.start
-    assert_raise(RuntimeError) do
-    	RubyProf.start
-    end
-    
-    assert_raise(RuntimeError) do
-      RubyProf.profile do
-        puts 1
-      end
-    end
-    RubyProf.stop
-  end
-  
-  
-  def test_no_block
-    assert_raise(ArgumentError) do
-			RubyProf.profile
-  	end
-  end
-  
-  def test_class_and_instance_methods
-    result = RubyProf.profile do
-	    C1.hello
-	    C1.new.hello
-    end
-  
-    methods = result.threads.values.first
-    
-    # Length should be 6:
-    # 	1 top level,
-    # 	1 Class.new
-    #		1 Class:Object allocate
-    #   1 for Object.initialize
-    #   1 for Class hello
-    #   1 for Object hello
-    assert_equal(6, methods.length)
-    
-    # Check class method
-    method1 = methods['<Class::C1>#hello']
-    assert_not_nil(method1)
-    
-    # Check instance method
-    method1 = methods['C1#hello']
-    assert_not_nil(method1)
-  end
-  
-  def test_module_methods
-    result = RubyProf.profile do
-	  	C2.hello
-	    C2.new.hello
-    end
-  
-    methods = result.threads.values.first
-   
-    # Length should be 5:
-    # 	1 top level,
-    # 	1 Class.new
-    #		1 Class:Object allocate
-    #   1 for Object.initialize
-    #   1 for hello
-    assert_equal(5, methods.length)
-    
-    # Check class method
-    method1 = methods['M1#hello']
-    assert_not_nil(method1)
-    assert_equal(2, method1.called)
-  end
-  
-  def test_singleton
-    c3 = C3.new
-    
-    class << c3
-    	def hello
-    	end
-  	end
-  
-    result = RubyProf.profile do
-	  	c3.hello
-    end
-  
-    methods = result.threads.values.first
-    
-    # Length should be 2 - one for top level
-    # and one for the singleton method.
-    assert_equal(2, methods.length)
-    
-    # Check singleton method
-    method1 = methods['<Object::C3>#hello']
-    assert_not_nil(method1)
-  end
-end
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'ruby-prof'
+require 'test_helper'
+
+class C1
+  def C1.hello
+  end
+  
+  def hello
+  end
+end
+
+module M1
+  def hello
+  end
+end
+
+class C2
+  include M1
+  extend M1
+end
+
+class C3
+  def hello
+  end
+end
+
+module M4
+  def hello
+  end
+end
+
+module M5
+  include M4
+  def goodbye
+    hello
+  end
+end
+
+class C6
+  include M5
+  def test
+    goodbye
+  end
+end
+
+class BasicTest < Test::Unit::TestCase
+  def test_running
+    assert(!RubyProf.running?)
+    RubyProf.start
+    assert(RubyProf.running?)
+    RubyProf.stop
+    assert(!RubyProf.running?)
+  end
+  
+  def test_double_profile
+    RubyProf.start
+    assert_raise(RuntimeError) do
+    	RubyProf.start
+    end
+    
+    assert_raise(RuntimeError) do
+      RubyProf.profile do
+        puts 1
+      end
+    end
+    RubyProf.stop
+  end
+  
+  def test_no_block
+    assert_raise(ArgumentError) do
+			RubyProf.profile
+  	end
+  end
+  
+  def test_class_and_instance_methods
+    result = RubyProf.profile do
+	    C1.hello
+	    C1.new.hello
+    end
+  
+    methods = result.threads.values.first
+    
+    # Length should be 6:
+    # 	1 top level,
+    # 	1 Class.new
+    #		1 Class:Object allocate
+    #   1 for Object.initialize
+    #   1 for Class hello
+    #   1 for Object hello
+    assert_equal(6, methods.length)
+    
+    # Check class method
+    method1 = methods['<Class::C1>#hello']
+    assert_not_nil(method1)
+    
+    # Check instance method
+    method1 = methods['C1#hello']
+    assert_not_nil(method1)
+  end
+  
+  def test_module_methods
+    result = RubyProf.profile do
+	  	C2.hello
+	    C2.new.hello
+    end
+  
+    methods = result.threads.values.first
+   
+    # Length should be 5:
+    # 	1 top level,
+    # 	1 Class.new
+    #		1 Class:Object allocate
+    #   1 for Object.initialize
+    #   1 for hello
+    assert_equal(5, methods.length)
+    
+    # Check class method
+    method1 = methods['M1#hello']
+    assert_not_nil(method1)
+    assert_equal(2, method1.called)
+  end
+  
+  def test_singleton
+    c3 = C3.new
+    
+    class << c3
+    	def hello
+    	end
+  	end
+  
+    result = RubyProf.profile do
+	  	c3.hello
+    end
+  
+    methods = result.threads.values.first
+    
+    # Length should be 2 - one for top level
+    # and one for the singleton method.
+    assert_equal(2, methods.length)
+    
+    # Check singleton method
+    method1 = methods['<Object::C3>#hello']
+    assert_not_nil(method1)
+  end
+end

data/test/clock_mode_test.rb

@@ -1,73 +1,73 @@
-#!/usr/bin/env ruby
-
-require 'test/unit'
-require 'ruby-prof'
-require 'test_helper'
-require 'prime'
-
-
-# --  Tests ----
-class ClockModeTest < Test::Unit::TestCase
-  def test_clock
-    return
-    RubyProf::clock_mode = RubyProf::PROCESS_TIME
-    assert_equal(RubyProf::PROCESS_TIME, RubyProf::clock_mode)
-    result = RubyProf.profile do
-			run_primes
-		end
-		
-		print_results(result)
-    
-    result.threads.values.each do |methods|
-			methods.values.each do |method|
-    		check_parent_times(method)
-    		check_parent_calls(method)
-    		check_child_times(method)		
-			end
-  	end
-  end
-  
-  def test_gettimeofday
-    return
-    RubyProf::clock_mode = RubyProf::WALL_TIME
-    assert_equal(RubyProf::WALL_TIME, RubyProf::clock_mode)
-    result = RubyProf.profile do
-			run_primes
-		end
-    
-		print_results(result)
-		
-    result.threads.values.each do |methods|
-			methods.values.each do |method|
-    		check_parent_times(method)
-    		check_parent_calls(method)
-    		check_child_times(method)		
-			end
-  	end
-  end
-  
-  def test_cpu
-    #return
-    RubyProf::clock_mode = RubyProf::CPU_TIME
-    assert_equal(RubyProf::CPU, RubyProf::clock_mode)
-    result = RubyProf.profile do
-			run_primes
-		end
-    
-		print_results(result)
-		
-    result.threads.values.each do |methods|
-			methods.values.each do |method|
-    		check_parent_times(method)
-    		check_parent_calls(method)
-    		check_child_times(method)		
-			end
-  	end
-  end
-  
-  def test_invalid
-    assert_raise(ArgumentError) do
-    	RubyProf::clock_mode = 7777
-    end
-  end
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'ruby-prof'
+require 'test_helper'
+require 'prime'
+
+
+# --  Tests ----
+class ClockModeTest < Test::Unit::TestCase
+  def test_clock
+    return
+    RubyProf::clock_mode = RubyProf::PROCESS_TIME
+    assert_equal(RubyProf::PROCESS_TIME, RubyProf::clock_mode)
+    result = RubyProf.profile do
+			run_primes
+		end
+		
+		print_results(result)
+    
+    result.threads.values.each do |methods|
+			methods.values.each do |method|
+    		check_parent_times(method)
+    		check_parent_calls(method)
+    		check_child_times(method)		
+			end
+  	end
+  end
+  
+  def test_gettimeofday
+    return
+    RubyProf::clock_mode = RubyProf::WALL_TIME
+    assert_equal(RubyProf::WALL_TIME, RubyProf::clock_mode)
+    result = RubyProf.profile do
+			run_primes
+		end
+    
+		print_results(result)
+		
+    result.threads.values.each do |methods|
+			methods.values.each do |method|
+    		check_parent_times(method)
+    		check_parent_calls(method)
+    		check_child_times(method)		
+			end
+  	end
+  end
+  
+  def test_cpu
+    #return
+    RubyProf::clock_mode = RubyProf::CPU_TIME
+    assert_equal(RubyProf::CPU, RubyProf::clock_mode)
+    result = RubyProf.profile do
+			run_primes
+		end
+    
+		print_results(result)
+		
+    result.threads.values.each do |methods|
+			methods.values.each do |method|
+    		check_parent_times(method)
+    		check_parent_calls(method)
+    		check_child_times(method)		
+			end
+  	end
+  end
+  
+  def test_invalid
+    assert_raise(ArgumentError) do
+    	RubyProf::clock_mode = 7777
+    end
+  end
 end