ruby-prof 0.15.4 → 0.15.5

data/lib/ruby-prof/printers/flat_printer_with_line_numbers.rb

@@ -25,7 +25,7 @@ module RubyProf
         #self_time_called = method.called > 0 ? method.self_time/method.called : 0
         #total_time_called = method.called > 0? method.total_time/method.called : 0
 
-        @output << "%6.2f  %9.3f %9.3f %9.3f %9.3f %8d  %s%s \n" % [
+        @output << "%6.2f  %9.3f %9.3f %9.3f %9.3f %8d  %s%s" % [
             method.self_time / total_time * 100, # %self
             method.total_time,                   # total
             method.self_time,                    # self
@@ -35,23 +35,30 @@ module RubyProf
             method.recursive? ? "*" : " ",       # cycle
             method_name(method)                  # name
         ]
-         if method.source_file != 'ruby_runtime'
-           @output << "  %s:%s" % [File.expand_path(method.source_file), method.line]
+         if method.source_file == 'ruby_runtime'
+           @output << "\n"
+         else
+           @output << "\n      defined at:\n"
+           @output << "          %s:%s\n" % [File.expand_path(method.source_file), method.line]
          end
-         @output << "\n\tcalled from: "
 
-         # make sure they're unique
-         method.call_infos.map{|ci|
+         callers = []
+         method.call_infos.each do |ci|
            if ci.parent && ci.parent.target.source_file != 'ruby_runtime'
-              [method_name(ci.parent.target), File.expand_path(ci.parent.target.source_file), ci.parent.target.line]
-           else
-              nil
+             callers << [method_name(ci.parent.target), File.expand_path(ci.parent.target.source_file), ci.parent.target.line]
            end
-         }.compact.uniq.each{|args|
-             @output << " %s (%s:%s) " % args
-         }
-         @output << "\n\n"
+         end
+         # make sure callers are unique
+         callers.uniq!
+
+         unless callers.empty?
+           @output << "      called from:\n"
+           callers.each do |args|
+             @output << "          %s (%s:%s)\n" % args
+           end
+         end
+         @output << "\n"
       end
     end
   end
-end
+end

data/lib/ruby-prof/printers/graph_printer.rb

@@ -21,6 +21,7 @@ module RubyProf
     private
 
     def print_header(thread)
+      @output << "Measure Mode: %s\n" % RubyProf.measure_mode_string
       @output << "Thread ID: #{thread.id}\n"
       @output << "Fiber ID: #{thread.fiber_id}\n" unless thread.id == thread.fiber_id
       @output << "Total Time: #{thread.total_time}\n"

data/lib/ruby-prof/version.rb

@@ -1,3 +1,3 @@
 module RubyProf
-  VERSION = "0.15.4"
+  VERSION = "0.15.5"
 end

data/test/measure_cpu_time_test.rb

@@ -121,7 +121,7 @@ class MeasureCpuTimeTest < TestCase
 
     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.05)
+    assert_in_delta(0, methods[1].self_time, 0.1)
   end
 
   def test_singleton

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 0.15.4
+  version: 0.15.5
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-14 00:00:00.000000000 Z
+date: 2015-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -73,16 +73,67 @@ files:
 - Rakefile
 - bin/ruby-prof
 - bin/ruby-prof-check-trace
+- doc/LICENSE.html
+- doc/README_rdoc.html
+- doc/Rack.html
+- doc/Rack/RubyProf.html
+- doc/RubyProf.html
+- doc/RubyProf/AbstractPrinter.html
+- doc/RubyProf/AggregateCallInfo.html
+- doc/RubyProf/CallInfo.html
+- doc/RubyProf/CallInfoPrinter.html
+- doc/RubyProf/CallInfoVisitor.html
+- doc/RubyProf/CallStackPrinter.html
+- doc/RubyProf/CallTreePrinter.html
+- doc/RubyProf/Cmd.html
+- doc/RubyProf/DotPrinter.html
+- doc/RubyProf/FlatPrinter.html
+- doc/RubyProf/FlatPrinterWithLineNumbers.html
+- doc/RubyProf/GraphHtmlPrinter.html
+- doc/RubyProf/GraphPrinter.html
+- doc/RubyProf/MethodInfo.html
+- doc/RubyProf/MultiPrinter.html
+- doc/RubyProf/Profile.html
+- doc/RubyProf/ProfileTask.html
+- doc/RubyProf/Thread.html
 - doc/created.rid
 - doc/css/fonts.css
 - doc/css/rdoc.css
+- doc/examples/flat_txt.html
+- doc/examples/graph_html.html
+- doc/examples/graph_txt.html
 - doc/fonts/Lato-Light.ttf
 - doc/fonts/Lato-LightItalic.ttf
 - doc/fonts/Lato-Regular.ttf
 - doc/fonts/Lato-RegularItalic.ttf
 - doc/fonts/SourceCodePro-Bold.ttf
 - doc/fonts/SourceCodePro-Regular.ttf
+- doc/images/add.png
+- doc/images/arrow_up.png
+- doc/images/brick.png
+- doc/images/brick_link.png
+- doc/images/bug.png
+- doc/images/bullet_black.png
+- doc/images/bullet_toggle_minus.png
+- doc/images/bullet_toggle_plus.png
+- doc/images/date.png
+- doc/images/delete.png
+- doc/images/find.png
 - doc/images/loadingAnimation.gif
+- doc/images/macFFBgHack.png
+- doc/images/package.png
+- doc/images/page_green.png
+- doc/images/page_white_text.png
+- doc/images/page_white_width.png
+- doc/images/plugin.png
+- doc/images/ruby.png
+- doc/images/tag_blue.png
+- doc/images/tag_green.png
+- doc/images/transparent.png
+- doc/images/wrench.png
+- doc/images/wrench_orange.png
+- doc/images/zoom.png
+- doc/index.html
 - doc/js/darkfish.js
 - doc/js/jquery.js
 - doc/js/navigation.js
@@ -92,6 +143,7 @@ files:
 - doc/js/search_index.js.gz
 - doc/js/searcher.js
 - doc/js/searcher.js.gz
+- doc/table_of_contents.html
 - examples/empty.png
 - examples/flat.txt
 - examples/graph.dot