ruby-prof 0.5.0-mswin32 → 0.5.1-mswin32

data/test/line_number_test.rb

@@ -0,0 +1,69 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'ruby-prof'
+require 'prime'
+require 'test_helper'
+
+class LineNumbers
+  def method1
+    a = 3
+  end
+  
+  def method2
+    method1
+  end
+  
+  def method3
+    sleep(1)
+  end
+end
+
+# --  Tests ----
+class LineNumbersTest < Test::Unit::TestCase
+  def test_function_line_no
+    numbers = LineNumbers.new
+    
+    result = RubyProf.profile do
+      numbers.method2
+    end
+
+    methods = result.threads.values.first.sort.reverse
+    assert_equal(3, methods.length)
+    
+    method = methods[0]
+    assert_equal('LineNumbersTest#test_function_line_no', method.full_name)
+    assert_equal(28, method.line)
+    
+    method = methods[1]
+    assert_equal('LineNumbers#method1', method.full_name)
+    assert_equal(9, method.line)
+    
+    method = methods[2]
+    assert_equal('LineNumbers#method2', method.full_name)
+    assert_equal(13, method.line)
+  end
+  
+  def test_c_function
+    numbers = LineNumbers.new
+    
+    result = RubyProf.profile do
+      numbers.method3
+    end
+
+    methods = result.threads.values.first.sort.reverse
+    assert_equal(3, methods.length)
+    
+    method = methods[0]
+    assert_equal('LineNumbersTest#test_c_function', method.full_name)
+    assert_equal(51, method.line)
+    
+    method = methods[1]
+    assert_equal('LineNumbers#method3', method.full_name)
+    assert_equal(17, method.line)
+    
+    method = methods[2]
+    assert_equal('Kernel#sleep', method.full_name)
+    assert_equal(0, method.line)
+  end
+end

data/test/module_test.rb

@@ -7,7 +7,6 @@ require 'test_helper'
 # Need to use wall time for this test due to the sleep calls
 RubyProf::measure_mode = RubyProf::WALL_TIME
 
-
 module Foo
   def Foo::hello
     sleep(0.5)
@@ -44,10 +43,10 @@ class ModuleTest < Test::Unit::TestCase
     assert_equal('ModuleTest#test_nested_modules', method.full_name)
     
     method = methods[1]
-    assert_equal('Bar#hello', method.full_name)
+    assert_equal('Kernel#sleep', method.full_name)
     
     method = methods[2]
-    assert_equal('Kernel#sleep', method.full_name)
+    assert_equal('Bar#hello', method.full_name)
     
     method = methods[3]
     assert_equal('<Module::Bar>#hello', method.full_name)

data/test/prime.rb

@@ -5,54 +5,56 @@
 # Source from http://people.cs.uchicago.edu/~bomb154/154/maclabs/profilers-lab/
 
 def make_random_array(length, maxnum)
-	result = Array.new(length)
-	result.each_index do |i|
-		result[i] = rand(maxnum)
-	end
-		
-	result
+  result = Array.new(length)
+  result.each_index do |i|
+    result[i] = rand(maxnum)
+  end
+    
+  result
 end
  
 def is_prime(x)
-	y = 2
-	y.upto(x-1) do |i|
-		return false if (x % i) == 0
-	end
-	true
+  y = 2
+  y.upto(x-1) do |i|
+    return false if (x % i) == 0
+  end
+  true
 end
 
 def find_primes(arr)
-	result = arr.select do |value|
-		is_prime(value)
-	end
-	result
+  result = arr.select do |value|
+    is_prime(value)
+  end
+  result
 end
 
 def find_largest(primes)
-	largest = primes.first
+  largest = primes.first
 
-	# Intentionally use upto for example purposes
-	# (upto is also called from is_prime)
-	0.upto(primes.length-1) do |i|
+  # Intentionally use upto for example purposes
+  # (upto is also called from is_prime)
+  0.upto(primes.length-1) do |i|
     sleep(0.02)
     prime = primes[i]
-		if prime > largest
-			largest = prime
-		end
-	end
-	largest
+    if prime > largest
+      largest = prime
+    end
+  end
+  largest
 end
 
 def run_primes
-	length = 500	
+  length = 500  
   maxnum = 10000
   
   # Create random numbers
- 	random_array = make_random_array(length, maxnum)
- 	
- 	# Find the primes
+  random_array = make_random_array(length, maxnum)
+  
+  # Find the primes
   primes = find_primes(random_array)
   
   # Find the largest primes
- 	largest = find_largest(primes)
+  largest = find_largest(primes)
 end
+
+run_primes

data/test/recursive_test.rb

@@ -93,7 +93,7 @@ class RecursiveTest < Test::Unit::TestCase
     assert_equal(3, method.children.length)
     
     method = methods[4]
-    assert_equal('Fixnum#==', method.full_name)
+    assert_equal('Fixnum#-', method.full_name)
     assert_in_delta(0, method.total_time, 0.02)
     assert_in_delta(0, method.self_time, 0.02)
     assert_in_delta(0, method.wait_time, 0.02)
@@ -103,7 +103,7 @@ class RecursiveTest < Test::Unit::TestCase
     assert_equal(0, method.children.length)
     
     method = methods[5]
-    assert_equal('Fixnum#-', method.full_name)
+    assert_equal('Fixnum#==', method.full_name)
     assert_in_delta(0, method.total_time, 0.02)
     assert_in_delta(0, method.self_time, 0.02)
     assert_in_delta(0, method.wait_time, 0.02)

data/test/test_suite.rb

@@ -2,6 +2,7 @@
 require 'test/unit'
 require 'basic_test'
 require 'duplicate_names_test'
+require 'line_number_test'
 require 'measure_mode_test'
 require 'module_test'
 require 'no_method_class_test'

data/test/thread_test.rb

@@ -87,26 +87,25 @@ class ThreadTest < Test::Unit::TestCase
     assert_equal(1, method.parents.length)
     assert_equal(0, method.children.length)
     
-    
     method = methods[3]
-    assert_equal('Thread#initialize', method.full_name)
+    assert_equal('<Class::Thread>#new', method.full_name)
     assert_in_delta(0, method.total_time, 0.02)
     assert_in_delta(0, method.self_time, 0.02)
     assert_in_delta(0, method.wait_time, 0.02)
     assert_in_delta(0, method.children_time, 0.02)
     assert_equal(1, method.called)
     assert_equal(1, method.parents.length)
-    assert_equal(0, method.children.length)
+    assert_equal(1, method.children.length)
     
     method = methods[4]
-    assert_equal('<Class::Thread>#new', method.full_name)
+    assert_equal('Thread#initialize', method.full_name)
     assert_in_delta(0, method.total_time, 0.02)
     assert_in_delta(0, method.self_time, 0.02)
     assert_in_delta(0, method.wait_time, 0.02)
     assert_in_delta(0, method.children_time, 0.02)
     assert_equal(1, method.called)
     assert_equal(1, method.parents.length)
-    assert_equal(1, method.children.length)
+    assert_equal(0, method.children.length)
   end
 
   def test_thread
@@ -121,11 +120,6 @@ class ThreadTest < Test::Unit::TestCase
       end
     end
     
-    printer = RubyProf::GraphHtmlPrinter.new(result)
-    File.open('c:/temp/test.html', 'w') do |file|
-      printer.print(file)
-    end
-    
     result.threads.each do |thread_id, methods|
       STDOUT << "thread: " << thread_id << "\n"
       methods.each do |method|

data/test/timing_test.rb

@@ -29,12 +29,14 @@ class TimingTest < Test::Unit::TestCase
     result = RubyProf.profile do
       method1
     end
+    print_results(result)
 
     assert_equal(1, result.threads.length)
 
     methods = result.threads.values.first
     assert_equal(3, methods.length)
 
+    
     methods = methods.sort.reverse
     
     method = methods[0]

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: ruby-prof
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
-date: 2007-07-09 00:05:23 -06:00
+  version: 0.5.1
+date: 2007-07-18 10:34:52 -06:00
 summary: Fast Ruby profiler
 require_paths: 
 - lib
@@ -43,12 +43,7 @@ files:
 - lib/ruby-prof/graph_html_printer.rb
 - lib/ruby-prof/graph_printer.rb
 - lib/ruby-prof/profile_test_case.rb
-- lib/ruby-prof/rails_plugin
 - lib/ruby-prof/task.rb
-- lib/ruby-prof/rails_plugin/ruby-prof
-- lib/ruby-prof/rails_plugin/ruby-prof/init.rb
-- lib/ruby-prof/rails_plugin/ruby-prof/lib
-- lib/ruby-prof/rails_plugin/ruby-prof/lib/profiling.rb
 - examples/flat.txt
 - examples/graph.html
 - examples/graph.txt
@@ -61,6 +56,7 @@ files:
 - test/basic_test.rb
 - test/duplicate_names_test.rb
 - test/gc.log
+- test/line_number_test.rb
 - test/measure_mode_test.rb
 - test/module_test.rb
 - test/no_method_class_test.rb

data/lib/ruby-prof/rails_plugin/ruby-prof/init.rb

@@ -1,6 +0,0 @@
-require 'profiling'
-
-ActionController::Base.class_eval do
-  include ActionController::Profiling
-end
-  

data/lib/ruby-prof/rails_plugin/ruby-prof/lib/profiling.rb

@@ -1,52 +0,0 @@
-require 'ruby-prof'
-
-module ActionController #:nodoc:
-  # The ruby-prof module times the performance of actions and reports to the logger. If the Active Record
-  # package has been included, a separate timing section for database calls will be added as well.
-  module Profiling #:nodoc:
-    def self.included(base)
-      base.class_eval do
-        alias_method_chain :perform_action, :profiling
-      end
-    end
-
-    def perform_action_with_profiling
-      if not logger or
-         not logger.level == Logger::DEBUG
-        perform_action_without_profiling
-      else
-        result = RubyProf.profile do
-          perform_action_without_profiling
-        end
-        
-        output = StringIO.new
-        output << " [#{complete_request_uri rescue "unknown"}]"
-        output << "\n\n"
-        
-        # Create a flat printer
-        printer = RubyProf::FlatPrinter.new(result)
-        
-        # Skip anything less than 1% - which is a lot of
-        # stuff in Rails. Don't print the source file
-        # its too noisy.
-        printer.print(output, {:min_percent => 1,
-                               :print_file => false})
-        logger.info(output.string)
-        
-        ## Example for Graph html printer
-        #printer = RubyProf::GraphHtmlPrinter.new(result)
-        #File.open('c:/temp/request.html', 'w') do |file|
-          #printer.print(file, {:min_percent => 1,
-                               #:print_file => true})
-        #end   
-        
-        ## Used for KCacheGrind visualizations
-        #printer = RubyProf::CallTreePrinter.new(result)
-        #File.open('c:/temp/callgrind.out', 'w') do |file|
-          #printer.print(file, {:min_percent => 1,
-                                 #:print_file => true})
-        #end          
-      end
-    end
-  end
-end