ruby-prof 1.6.3 → 1.7.2

data/lib/ruby-prof/exclude_common_methods.rb

@@ -1,198 +1,204 @@
-require 'set'
-
-# :enddoc:
-module RubyProf
-  module ExcludeCommonMethods
-    ENUMERABLE_NAMES = Enumerable.instance_methods(false)
-
-    def self.apply!(profile)
-      ##
-      #  Kernel Methods
-      ##
-
-      exclude_methods(profile, Kernel, [
-        :dup,
-        :initialize_dup,
-        :tap,
-        :send,
-        :public_send,
-      ])
-
-      ##
-      #  Fundamental Types
-      ##
-
-      exclude_methods(profile, BasicObject,  :"!=")
-      exclude_methods(profile, Method,       :"[]")
-      exclude_methods(profile, Module,       :new)
-      exclude_methods(profile, Class,        :new)
-      exclude_methods(profile, Proc,         :call, :yield)
-      exclude_methods(profile, Range,        :each)
-      exclude_methods(profile, Integer,      :times)
-
-      ##
-      #  Value Types
-      ##
-
-      exclude_methods(profile, String, [
-        :sub,
-        :sub!,
-        :gsub,
-        :gsub!,
-      ])
-
-      ##
-      #  Emumerables
-      ##
-
-      exclude_enumerable(profile, Enumerable)
-      exclude_enumerable(profile, Enumerator)
-
-      ##
-      #  Collections
-      ##
-
-      exclude_enumerable(profile, Array, [
-        :each_index,
-        :map!,
-        :select!,
-        :reject!,
-        :collect!,
-        :sort!,
-        :sort_by!,
-        :index,
-        :delete_if,
-        :keep_if,
-        :drop_while,
-        :uniq,
-        :uniq!,
-        :"==",
-        :eql?,
-        :hash,
-        :to_json,
-        :as_json,
-        :encode_json,
-      ])
-
-      exclude_enumerable(profile, Hash, [
-        :dup,
-        :initialize_dup,
-        :fetch,
-        :"[]",
-        :"[]=",
-        :each_key,
-        :each_value,
-        :each_pair,
-        :map!,
-        :select!,
-        :reject!,
-        :collect!,
-        :delete_if,
-        :keep_if,
-        :slice,
-        :slice!,
-        :except,
-        :except!,
-        :"==",
-        :eql?,
-        :hash,
-        :to_json,
-        :as_json,
-        :encode_json,
-      ])
-
-      exclude_enumerable(profile, Set, [
-        :map!,
-        :select!,
-        :reject!,
-        :collect!,
-        :classify,
-        :delete_if,
-        :keep_if,
-        :divide,
-        :"==",
-        :eql?,
-        :hash,
-        :to_json,
-        :as_json,
-        :encode_json,
-      ])
-
-      ##
-      #  Garbage Collection
-      ##
-
-      exclude_singleton_methods(profile, GC, [
-        :start
-      ])
-
-      ##
-      #  Unicorn
-      ##
-
-      if defined?(Unicorn)
-        exclude_methods(profile, Unicorn::HttpServer, :process_client)
-      end
-
-      if defined?(Unicorn::OobGC)
-        exclude_methods(profile, Unicorn::OobGC, :process_client)
-      end
-
-      ##
-      #  New Relic
-      ##
-
-      if defined?(NewRelic::Agent)
-        if defined?(NewRelic::Agent::Instrumentation::MiddlewareTracing)
-          exclude_methods(profile, NewRelic::Agent::Instrumentation::MiddlewareTracing, [
-            :call
-          ])
-        end
-
-        if defined?(NewRelic::Agent::MethodTracerHelpers)
-          exclude_methods(profile, NewRelic::Agent::MethodTracerHelpers, [
-            :trace_execution_scoped,
-            :log_errors,
-          ])
-
-          exclude_singleton_methods(profile, NewRelic::Agent::MethodTracerHelpers, [
-            :trace_execution_scoped,
-            :log_errors,
-          ])
-        end
-
-        if defined?(NewRelic::Agent::MethodTracer)
-          exclude_methods(profile, NewRelic::Agent::MethodTracer, [
-            :trace_execution_scoped,
-            :trace_execution_unscoped,
-          ])
-        end
-      end
-
-        ##
-        #  Miscellaneous Methods
-        ##
-
-      if defined?(Mustache)
-        exclude_methods(profile, Mustache::Context, [
-          :fetch
-        ])
-      end
-    end
-
-    private
-
-    def self.exclude_enumerable(profile, mod, *method_or_methods)
-      exclude_methods(profile, mod, [:each, *method_or_methods])
-      exclude_methods(profile, mod, ENUMERABLE_NAMES)
-    end
-
-    def self.exclude_methods(profile, mod, *method_or_methods)
-      profile.exclude_methods!(mod, method_or_methods)
-    end
-
-    def self.exclude_singleton_methods(profile, mod, *method_or_methods)
-      profile.exclude_singleton_methods!(mod, method_or_methods)
-    end
-  end
-end
+require 'set'
+
+# :enddoc:
+module RubyProf
+  module ExcludeCommonMethods
+    ENUMERABLE_NAMES = Enumerable.instance_methods(false)
+
+    def self.apply!(profile)
+      ##
+      #  Kernel Methods
+      ##
+
+      exclude_methods(profile, Kernel, [
+        :dup,
+        :initialize_dup,
+        :tap,
+        :send,
+        :public_send,
+      ])
+
+      ##
+      #  Fundamental Types
+      ##
+
+      exclude_methods(profile, BasicObject,  :!=)
+      exclude_methods(profile, Kernel,       :"block_given?")
+      exclude_methods(profile, Method,       :[])
+      exclude_methods(profile, Module,       :new)
+      exclude_methods(profile, Class,        :new)
+      exclude_methods(profile, Proc,         :call, :yield)
+      exclude_methods(profile, Range,        :each)
+
+      ##
+      #  Value Types
+      ##
+
+      exclude_methods(profile, Integer, [
+        :times,
+        :succ,
+        :<
+      ])
+
+      exclude_methods(profile, String, [
+        :sub,
+        :sub!,
+        :gsub,
+        :gsub!,
+      ])
+
+      ##
+      #  Emumerables
+      ##
+
+      exclude_enumerable(profile, Enumerable)
+      exclude_enumerable(profile, Enumerator)
+
+      ##
+      #  Collections
+      ##
+
+      exclude_enumerable(profile, Array, [
+        :each_index,
+        :map!,
+        :select!,
+        :reject!,
+        :collect!,
+        :sort!,
+        :sort_by!,
+        :index,
+        :delete_if,
+        :keep_if,
+        :drop_while,
+        :uniq,
+        :uniq!,
+        :"==",
+        :eql?,
+        :hash,
+        :to_json,
+        :as_json,
+        :encode_json,
+      ])
+
+      exclude_enumerable(profile, Hash, [
+        :dup,
+        :initialize_dup,
+        :fetch,
+        :"[]",
+        :"[]=",
+        :each_key,
+        :each_value,
+        :each_pair,
+        :map!,
+        :select!,
+        :reject!,
+        :collect!,
+        :delete_if,
+        :keep_if,
+        :slice,
+        :slice!,
+        :except,
+        :except!,
+        :"==",
+        :eql?,
+        :hash,
+        :to_json,
+        :as_json,
+        :encode_json,
+      ])
+
+      exclude_enumerable(profile, Set, [
+        :map!,
+        :select!,
+        :reject!,
+        :collect!,
+        :classify,
+        :delete_if,
+        :keep_if,
+        :divide,
+        :"==",
+        :eql?,
+        :hash,
+        :to_json,
+        :as_json,
+        :encode_json,
+      ])
+
+      ##
+      #  Garbage Collection
+      ##
+
+      exclude_singleton_methods(profile, GC, [
+        :start
+      ])
+
+      ##
+      #  Unicorn
+      ##
+
+      if defined?(Unicorn)
+        exclude_methods(profile, Unicorn::HttpServer, :process_client)
+      end
+
+      if defined?(Unicorn::OobGC)
+        exclude_methods(profile, Unicorn::OobGC, :process_client)
+      end
+
+      ##
+      #  New Relic
+      ##
+
+      if defined?(NewRelic::Agent)
+        if defined?(NewRelic::Agent::Instrumentation::MiddlewareTracing)
+          exclude_methods(profile, NewRelic::Agent::Instrumentation::MiddlewareTracing, [
+            :call
+          ])
+        end
+
+        if defined?(NewRelic::Agent::MethodTracerHelpers)
+          exclude_methods(profile, NewRelic::Agent::MethodTracerHelpers, [
+            :trace_execution_scoped,
+            :log_errors,
+          ])
+
+          exclude_singleton_methods(profile, NewRelic::Agent::MethodTracerHelpers, [
+            :trace_execution_scoped,
+            :log_errors,
+          ])
+        end
+
+        if defined?(NewRelic::Agent::MethodTracer)
+          exclude_methods(profile, NewRelic::Agent::MethodTracer, [
+            :trace_execution_scoped,
+            :trace_execution_unscoped,
+          ])
+        end
+      end
+
+        ##
+        #  Miscellaneous Methods
+        ##
+
+      if defined?(Mustache)
+        exclude_methods(profile, Mustache::Context, [
+          :fetch
+        ])
+      end
+    end
+
+    private
+
+    def self.exclude_enumerable(profile, mod, *method_or_methods)
+      exclude_methods(profile, mod, [:each, *method_or_methods])
+      exclude_methods(profile, mod, ENUMERABLE_NAMES)
+    end
+
+    def self.exclude_methods(profile, mod, *method_or_methods)
+      profile.exclude_methods!(mod, method_or_methods)
+    end
+
+    def self.exclude_singleton_methods(profile, mod, *method_or_methods)
+      profile.exclude_singleton_methods!(mod, method_or_methods)
+    end
+  end
+end

data/lib/ruby-prof/method_info.rb

@@ -1,85 +1,87 @@
-# encoding: utf-8
-
-module RubyProf
-  # The MethodInfo class is used to track information about each method that is profiled.
-  # You cannot create a MethodInfo object directly, they are generated while running a profile.
-  class MethodInfo
-    include Comparable
-
-    # Returns the full name of a class. The interpretation of method names is:
-    #
-    # * MyObject#test - An method defined in a class
-    # * <Class:MyObject>#test - A method defined in a singleton class.
-    # * <Module:MyObject>#test - A method defined in a singleton module.
-    # * <Object:MyObject>#test - A method defined in a singleton object.
-    def full_name
-      decorated_class_name = case self.klass_flags
-                             when 0x2
-                               "<Class::#{klass_name}>"
-                             when 0x4
-                               "<Module::#{klass_name}>"
-                             when 0x8
-                               "<Object::#{klass_name}>"
-                             else
-                               klass_name
-                             end
-
-      "#{decorated_class_name}##{method_name}"
-    end
-
-    # The number of times this method was called
-    def called
-      self.measurement.called
-    end
-
-    # The total time this method took - includes self time + wait time + child time
-    def total_time
-      self.measurement.total_time
-    end
-
-    # The time this method took to execute
-    def self_time
-      self.measurement.self_time
-    end
-
-    # The time this method waited for other fibers/threads to execute
-    def wait_time
-      self.measurement.wait_time
-    end
-
-    # The time this method's children took to execute
-    def children_time
-      self.total_time - self.self_time - self.wait_time
-    end
-
-    def eql?(other)
-      self.hash == other.hash
-    end
-
-    def ==(other)
-      self.eql?(other)
-    end
-
-    def <=>(other)
-      if other.nil?
-        -1
-      elsif self.full_name == other.full_name
-        0
-      elsif self.total_time < other.total_time
-        -1
-      elsif self.total_time > other.total_time
-        1
-      elsif self.call_trees.min_depth < other.call_trees.min_depth
-        1
-      elsif self.call_trees.min_depth > other.call_trees.min_depth
-        -1
-      else
-        self.full_name <=> other.full_name
-      end
-    end
-
-    def to_s
-      "#{self.full_name} (c: #{self.called}, tt: #{self.total_time}, st: #{self.self_time}, wt: #{wait_time}, ct: #{self.children_time})"
-    end
-  end
-end
+# encoding: utf-8
+
+module RubyProf
+  # The MethodInfo class is used to track information about each method that is profiled.
+  # You cannot create a MethodInfo object directly, they are generated while running a profile.
+  class MethodInfo
+    include Comparable
+
+    # Returns the full name of a class. The interpretation of method names is:
+    #
+    # * MyObject#test - An method defined in a class
+    # * <Class:MyObject>#test - A method defined in a singleton class.
+    # * <Module:MyObject>#test - A method defined in a singleton module.
+    # * <Object:MyObject>#test - A method defined in a singleton object.
+    def full_name
+      decorated_class_name = case self.klass_flags
+                             when 0x2
+                               "<Class::#{klass_name}>"
+                             when 0x4
+                               "<Module::#{klass_name}>"
+                             when 0x8
+                               "<Object::#{klass_name}>"
+                             else
+                               klass_name
+                             end
+
+      "#{decorated_class_name}##{method_name}"
+    end
+
+    # The number of times this method was called
+    def called
+      self.measurement.called
+    end
+
+    # The total time this method took - includes self time + wait time + child time
+    def total_time
+      self.measurement.total_time
+    end
+
+    # The time this method took to execute
+    def self_time
+      self.measurement.self_time
+    end
+
+    # The time this method waited for other fibers/threads to execute
+    def wait_time
+      self.measurement.wait_time
+    end
+
+    # The time this method's children took to execute
+    def children_time
+      self.total_time - self.self_time - self.wait_time
+    end
+
+    def eql?(other)
+      self.hash == other.hash
+    end
+
+    def ==(other)
+      self.eql?(other)
+    end
+
+    def <=>(other)
+      sort_delta = 0.0001
+
+      if other.nil?
+        -1
+      elsif self.full_name == other.full_name
+        0
+      elsif self.total_time < other.total_time && (self.total_time - other.total_time).abs > sort_delta
+        -1
+      elsif self.total_time > other.total_time && (self.total_time - other.total_time).abs > sort_delta
+        1
+      elsif self.call_trees.min_depth < other.call_trees.min_depth
+        1
+      elsif self.call_trees.min_depth > other.call_trees.min_depth
+        -1
+      else
+        self.full_name <=> other.full_name
+      end
+    end
+
+    def to_s
+      "#{self.full_name} (c: #{self.called}, tt: #{self.total_time}, st: #{self.self_time}, wt: #{wait_time}, ct: #{self.children_time})"
+    end
+  end
+end