ruby-prof 0.10.8 → 0.11.0.rc1

data/lib/ruby-prof/dot_printer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'set'
 
 module RubyProf
@@ -32,7 +34,7 @@ module RubyProf
     # STDOUT.
     #  
     # options - Hash of print options.  See #setup_options 
-    #           for more information.
+    # for more information.
     #
     # When profiling results that cover a large number of method calls it
     # helps to use the :min_percent option, for example:
@@ -59,7 +61,7 @@ module RubyProf
     # RubyProf.measure_mode so that we can display it.  Otherwise it's easy to
     # forget what measurement was made.
     def mode_name
-      mode = RubyProf.constants.find{|c| RubyProf.const_get(c) == RubyProf.measure_mode}
+      RubyProf.constants.find{|c| RubyProf.const_get(c) == RubyProf.measure_mode}
     end
     
     # Computes the total time per thread:
@@ -98,11 +100,9 @@ module RubyProf
     
     def print_methods(thread_id, methods)
       total_time = thread_times[thread_id]
-      # Print each method in total time order
-      methods.reverse_each do |method|
+      methods.sort_by(&sort_method).reverse_each do |method|
         total_percentage = (method.total_time/total_time) * 100
-        self_percentage = (method.self_time/total_time) * 100
-        
+
         next if total_percentage < min_percent
         name = method_name(method).split("#").last
         puts "#{dot_id(method)} [label=\"#{name}\\n(#{total_percentage.round}%)\"];"
@@ -149,4 +149,4 @@ module RubyProf
     end
     
   end
-end
+end

data/lib/ruby-prof/flat_printer.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 module RubyProf
   # Generates flat[link:files/examples/flat_txt.html] profile reports as text.
@@ -13,14 +14,17 @@ module RubyProf
   class FlatPrinter < AbstractPrinter
     # Print a flat profile report to the provided output.
     #
-    # output - Any IO oject, including STDOUT or a file.
+    # output - Any IO object, including STDOUT or a file.
     # The default value is STDOUT.
     #
     # options - Hash of print options.  See #setup_options
-    #           for more information.
+    # for more information.
     #
     def print(output = STDOUT, options = {})
       @output = output
+      # Now sort methods by largest self time by default,
+      # not total time like in other printouts
+      options[:sort_method] ||= :self_time
       setup_options(options)
       print_threads
     end
@@ -42,11 +46,7 @@ module RubyProf
         total_time = 0.01
       end
 
-      # Now sort methods by largest self time,
-      # not total time like in other printouts
-      methods = methods.sort do |m1, m2|
-        m1.self_time <=> m2.self_time
-      end.reverse
+      methods = methods.sort_by(&sort_method).reverse
 
       @output << "Thread ID: %d\n" % thread_id
       @output << "Total: %0.6f\n" % total_time

data/lib/ruby-prof/flat_printer_with_line_numbers.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 module RubyProf
   # Generates flat[link:files/examples/flat_txt.html] profile reports as text.
@@ -20,11 +21,7 @@ module RubyProf
         total_time = 0.01
       end
 
-      # Now sort methods by largest self time,
-      # not total time like in other printouts
-      methods = methods.sort do |m1, m2|
-        m1.self_time <=> m2.self_time
-      end.reverse
+      methods = methods.sort_by(&sort_method).reverse
 
       @output << "Thread ID: %d\n" % thread_id
       @output << "Total: %0.6f\n" % total_time

data/lib/ruby-prof/graph_html_printer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require 'erb'
 
 module RubyProf
@@ -40,7 +42,7 @@ module RubyProf
     # The default value is STDOUT.
     #
     # options - Hash of print options.  See #setup_options
-    #           for more information.
+    # for more information.
     #
     # unique options are:
     #   :filename    - specify a file to use that contains the ERB
@@ -219,7 +221,7 @@ module RubyProf
         </tr>
 
         <% min_time = @options[:min_time] || (@options[:nonzero] ? 0.005 : nil)
-           methods.sort.reverse_each do |method|
+           methods.sort_by(&sort_method).reverse_each do |method|
             total_percentage = (method.total_time/total_time) * 100
             next if total_percentage < min_percent
             next if min_time && method.total_time < min_time

data/lib/ruby-prof/graph_printer.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 module RubyProf
   # Generates graph[link:files/examples/graph_txt.html] profile reports as text.
@@ -7,7 +8,7 @@ module RubyProf
   #     [code to profile]
   #   end
   #
-  #   printer = RubyProf::GraphPrinter.new(result, 5)
+  #   printer = RubyProf::GraphPrinter.new(result)
   #   printer.print(STDOUT, {})
   #
   # The constructor takes two arguments. See the README
@@ -43,7 +44,7 @@ module RubyProf
     # The default value is STDOUT.
     #
     # options - Hash of print options.  See #setup_options
-    #           for more information.
+    # for more information.
     #
     def print(output = STDOUT, options = {})
       @output = output
@@ -62,7 +63,7 @@ module RubyProf
 
     def print_methods(thread_id, methods)
       # Sort methods from longest to shortest total time
-      methods = methods.sort
+      methods = methods.sort_by(&sort_method)
 
       toplevel = methods.last
       total_time = toplevel.total_time

data/lib/ruby-prof/method_info.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module RubyProf
   class MethodInfo
     include Comparable

data/lib/ruby-prof/multi_printer.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module RubyProf
   # Helper class to simplify printing profiles of several types from
   # one profiling run. Currently prints a flat profile, a callgrind

data/lib/ruby-prof/{result.rb → profile.rb}

@@ -1,6 +1,8 @@
+# encoding: utf-8
+
 require 'set'
 module RubyProf
-  class Result
+  class Profile
     # this method gets called internally when profiling is stopped.
     # it determines for each call_info whether it is minimal: a
     # call_info is minimal in a call tree if the call_info is not a

data/lib/ruby-prof/rack.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 
 module Rack
   class RubyProf

data/lib/ruby-prof/symbol_to_proc.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 unless (:a.respond_to?(:to_proc))
  class Symbol
    def to_proc

data/lib/ruby-prof/task.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: utf-8
 
 require 'rake'
 require 'rake/testtask'

data/lib/ruby-prof/test.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 # Now load ruby-prof and away we go
 require 'fileutils'
 require 'ruby-prof'

data/lib/unprof.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 require "ruby-prof"
 
 at_exit {

data/test/aggregate_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
+require File.expand_path('../test_helper', __FILE__)
 
 # Test data
 #   A   B   C
@@ -63,10 +63,10 @@ class AggregateTest < Test::Unit::TestCase
     # Check AggClass#z
     assert_equal('AggClass#z', method.full_name)
     assert_equal(3, method.called)
-    assert_in_delta(3, method.total_time, 0.01)
-    assert_in_delta(0, method.wait_time, 0.01)
-    assert_in_delta(0, method.self_time, 0.01)
-    assert_in_delta(3, method.children_time, 0.01)
+    assert_in_delta(3, method.total_time, 0.05)
+    assert_in_delta(0, method.wait_time, 0.05)
+    assert_in_delta(0, method.self_time, 0.05)
+    assert_in_delta(3, method.children_time, 0.05)
     assert_equal(3, method.call_infos.length)
 
     call_info = method.call_infos[0]
@@ -102,7 +102,7 @@ class AggregateTest < Test::Unit::TestCase
     call_info = call_infos.first
     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.wait_time, 0.05)
     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)
@@ -128,7 +128,7 @@ class AggregateTest < Test::Unit::TestCase
     call_info = call_infos.first
     assert_equal('AggClass#z', call_info.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.wait_time, 0.05)
     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)

data/test/basic_test.rb

@@ -1,54 +1,7 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 
-require 'test/unit'
-require 'ruby-prof'
-
-class C1
-  def C1.hello
-    sleep(0.1)
-  end
-
-  def hello
-    sleep(0.2)
-  end
-end
-
-module M1
-  def hello
-    sleep(0.3)
-  end
-end
-
-class C2
-  include M1
-  extend M1
-end
-
-class C3
-  def hello
-    sleep(0.4)
-  end
-end
-
-module M4
-  def hello
-    sleep(0.5)
-  end
-end
-
-module M5
-  include M4
-  def goodbye
-    hello
-  end
-end
-
-class C6
-  include M5
-  def test
-    goodbye
-  end
-end
+require File.expand_path('../test_helper', __FILE__)
 
 class BasicTest < Test::Unit::TestCase
   def setup
@@ -69,12 +22,6 @@ class BasicTest < Test::Unit::TestCase
     assert_raise(RuntimeError) do
       RubyProf.start
     end
-
-    assert_raise(RuntimeError) do
-      RubyProf.profile do
-        puts 1
-      end
-    end
     RubyProf.stop
   end
 
@@ -84,201 +31,6 @@ class BasicTest < Test::Unit::TestCase
     end
   end
 
-  def test_class_methods
-    result = RubyProf.profile do
-      C1.hello
-    end
-
-    # Length should be 3:
-    #   BasicTest#test_class_methods
-    #   <Class::C1>#hello
-    #   Kernel#sleep
-
-    methods = result.threads.values.first.sort.reverse
-    assert_equal(3, methods.length)
-
-    # Check the names
-    assert_equal('BasicTest#test_class_methods', methods[0].full_name)
-    assert_equal('<Class::C1>#hello', methods[1].full_name)
-    assert_equal('Kernel#sleep', methods[2].full_name)
-
-    # Check times
-    assert_in_delta(0.1, methods[0].total_time, 0.01)
-    assert_in_delta(0, methods[0].wait_time, 0.01)
-    assert_in_delta(0, methods[0].self_time, 0.01)
-
-    assert_in_delta(0.1, methods[1].total_time, 0.01)
-    assert_in_delta(0, methods[1].wait_time, 0.01)
-    assert_in_delta(0, methods[1].self_time, 0.01)
-
-    assert_in_delta(0.1, methods[2].total_time, 0.01)
-    assert_in_delta(0, methods[2].wait_time, 0.01)
-    assert_in_delta(0.1, methods[2].self_time, 0.01)
-  end
-
-  if RUBY_VERSION < '1.9'
-    PARENT = Object
-  else
-    PARENT = BasicObject
-  end
-
-  def test_instance_methods
-    result = RubyProf.profile do
-      C1.new.hello
-    end
-
-    # Methods called
-    #   BasicTest#test_instance_methods
-    #   Class.new
-    #   Class:Object#allocate
-    #   for Object#initialize
-    #   C1#hello
-    #   Kernel#sleep
-
-    methods = result.threads.values.first.sort.reverse
-    assert_equal(6, methods.length)
-    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)
-    assert_in_delta(0, methods[0].wait_time, 0.02)
-    assert_in_delta(0, methods[0].self_time, 0.02)
-
-    assert_in_delta(0.2, methods[1].total_time, 0.02)
-    assert_in_delta(0, methods[1].wait_time, 0.02)
-    assert_in_delta(0, methods[1].self_time, 0.02)
-
-    assert_in_delta(0.2, methods[2].total_time, 0.02)
-    assert_in_delta(0, methods[2].wait_time, 0.02)
-    assert_in_delta(0.2, methods[2].self_time, 0.02)
-
-    assert_in_delta(0, methods[3].total_time, 0.01)
-    assert_in_delta(0, methods[3].wait_time, 0.01)
-    assert_in_delta(0, methods[3].self_time, 0.01)
-
-    assert_in_delta(0, methods[4].total_time, 0.01)
-    assert_in_delta(0, methods[4].wait_time, 0.01)
-    assert_in_delta(0, methods[4].self_time, 0.01)
-
-    assert_in_delta(0, methods[5].total_time, 0.01)
-    assert_in_delta(0, methods[5].wait_time, 0.01)
-    assert_in_delta(0, methods[5].self_time, 0.01)
-  end
-
-  def test_module_methods
-    result = RubyProf.profile do
-      C2.hello
-    end
-
-    # Methods:
-    #   BasicTest#test_module_methods
-    #   M1#hello
-    #   Kernel#sleep
-
-    methods = result.threads.values.first.sort.reverse
-    assert_equal(3, methods.length)
-
-    assert_equal('BasicTest#test_module_methods', methods[0].full_name)
-    assert_equal('M1#hello', methods[1].full_name)
-    assert_equal('Kernel#sleep', methods[2].full_name)
-
-    # Check times
-    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.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.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
-    result = RubyProf.profile do
-      C2.new.hello
-    end
-
-    # Methods:
-    #   BasicTest#test_module_instance_methods
-    #   Class#new
-    #   <Class::Object>#allocate
-    #   Object#initialize
-    #   M1#hello
-    #   Kernel#sleep
-
-    methods = result.threads.values.first.sort.reverse
-    assert_equal(6, methods.length)
-    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.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)
-    assert_in_delta(0, methods[1].self_time, 0.01)
-
-    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, methods[3].total_time, 0.01)
-    assert_in_delta(0, methods[3].wait_time, 0.01)
-    assert_in_delta(0, methods[3].self_time, 0.01)
-
-    assert_in_delta(0, methods[4].total_time, 0.01)
-    assert_in_delta(0, methods[4].wait_time, 0.01)
-    assert_in_delta(0, methods[4].self_time, 0.01)
-
-    assert_in_delta(0, methods[5].total_time, 0.01)
-    assert_in_delta(0, methods[5].wait_time, 0.01)
-    assert_in_delta(0, methods[5].self_time, 0.01)
-  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.sort.reverse
-    assert_equal(2, methods.length)
-
-    assert_equal('BasicTest#test_singleton', methods[0].full_name)
-    assert_equal('<Object::C3>#hello', methods[1].full_name)
-
-    assert_in_delta(0, methods[0].total_time, 0.01)
-    assert_in_delta(0, methods[0].wait_time, 0.01)
-    assert_in_delta(0, methods[0].self_time, 0.01)
-
-    assert_in_delta(0, methods[1].total_time, 0.01)
-    assert_in_delta(0, methods[1].wait_time, 0.01)
-    assert_in_delta(0, methods[1].self_time, 0.01)
-  end
-
   def test_traceback
     RubyProf.start
     assert_raise(NoMethodError) do
@@ -287,4 +39,4 @@ class BasicTest < Test::Unit::TestCase
 
     RubyProf.stop
   end
-end
+end