ruby-prof 0.17.0 → 0.18.0

data/lib/ruby-prof/profile/exclude_common_methods.rb

@@ -1,201 +1,207 @@
-require 'set'
-
-module RubyProf
-  class Profile
-    class ExcludeCommonMethods
-      ENUMERABLE_NAMES = Enumerable.instance_methods(false)
-
-      def self.apply!(profile)
-        new(profile).apply!
-      end
-
-      def initialize(profile)
-        @profile = profile
-      end
-
-      def apply!
-        ##
-        #  Kernel Methods
-        ##
-
-        exclude_methods Kernel, [
-          :dup,
-          :initialize_dup,
-          :tap,
-          :send,
-          :public_send,
-        ]
-
-        ##
-        #  Fundamental Types
-        ##
-
-        exclude_methods BasicObject,  :"!="
-        exclude_methods Method,       :"[]"
-        exclude_methods Module,       :new
-        exclude_methods Class,        :new
-        exclude_methods Proc,         :call, :yield
-        exclude_methods Range,        :each
-        exclude_methods Integer,      :times
-
-        ##
-        #  Value Types
-        ##
-
-        exclude_methods String, [
-          :sub,
-          :sub!,
-          :gsub,
-          :gsub!,
-        ]
-
-        ##
-        #  Emumerables
-        ##
-
-        exclude_enumerable Enumerable
-        exclude_enumerable Enumerator
-
-        ##
-        #  Collections
-        ##
-
-        exclude_enumerable 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 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 Set, [
-          :map!,
-          :select!,
-          :reject!,
-          :collect!,
-          :classify,
-          :delete_if,
-          :keep_if,
-          :divide,
-          :"==",
-          :eql?,
-          :hash,
-          :to_json,
-          :as_json,
-          :encode_json,
-        ]
-
-        ##
-        #  Garbage Collection
-        ##
-
-        exclude_singleton_methods GC, [
-          :start
-        ]
-
-        ##
-        #  Unicorn
-        ##
-
-        if defined?(Unicorn)
-          exclude_methods Unicorn::HttpServer, :process_client
-        end
-
-        if defined?(Unicorn::OobGC)
-          exclude_methods Unicorn::OobGC, :process_client
-        end
-
-        ##
-        #  New Relic
-        ##
-
-        if defined?(NewRelic)
-          exclude_methods NewRelic::Agent::Instrumentation::MiddlewareTracing, [
-            :call
-          ]
-
-          exclude_methods NewRelic::Agent::MethodTracerHelpers, [
-            :trace_execution_scoped,
-            :log_errors,
-          ]
-
-          exclude_singleton_methods NewRelic::Agent::MethodTracerHelpers, [
-            :trace_execution_scoped,
-            :log_errors,
-          ]
-
-          exclude_methods NewRelic::Agent::MethodTracer, [
-            :trace_execution_scoped,
-            :trace_execution_unscoped,
-          ]
-        end
-
-          ##
-          #  Miscellaneous Methods
-          ##
-
-        if defined?(Mustache)
-          exclude_methods Mustache::Context, [
-            :fetch
-          ]
-        end
-      end
-
-      private
-
-      def exclude_methods(mod, *method_or_methods)
-        @profile.exclude_methods!(mod, method_or_methods)
-      end
-
-      def exclude_singleton_methods(mod, *method_or_methods)
-        @profile.exclude_singleton_methods!(mod, method_or_methods)
-      end
-
-      def exclude_enumerable(mod, *method_or_methods)
-        exclude_methods(mod, [:each, *method_or_methods])
-        exclude_methods(mod, ENUMERABLE_NAMES)
-      end
-    end
-  end
-end
+require 'set'
+
+module RubyProf
+  class Profile
+    class ExcludeCommonMethods
+      ENUMERABLE_NAMES = Enumerable.instance_methods(false)
+
+      def self.apply!(profile)
+        new(profile).apply!
+      end
+
+      def initialize(profile)
+        @profile = profile
+      end
+
+      def apply!
+        ##
+        #  Kernel Methods
+        ##
+
+        exclude_methods Kernel, [
+          :dup,
+          :initialize_dup,
+          :tap,
+          :send,
+          :public_send,
+        ]
+
+        ##
+        #  Fundamental Types
+        ##
+
+        exclude_methods BasicObject,  :"!="
+        exclude_methods Method,       :"[]"
+        exclude_methods Module,       :new
+        exclude_methods Class,        :new
+        exclude_methods Proc,         :call, :yield
+        exclude_methods Range,        :each
+        exclude_methods Integer,      :times
+
+        ##
+        #  Value Types
+        ##
+
+        exclude_methods String, [
+          :sub,
+          :sub!,
+          :gsub,
+          :gsub!,
+        ]
+
+        ##
+        #  Emumerables
+        ##
+
+        exclude_enumerable Enumerable
+        exclude_enumerable Enumerator
+
+        ##
+        #  Collections
+        ##
+
+        exclude_enumerable 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 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 Set, [
+          :map!,
+          :select!,
+          :reject!,
+          :collect!,
+          :classify,
+          :delete_if,
+          :keep_if,
+          :divide,
+          :"==",
+          :eql?,
+          :hash,
+          :to_json,
+          :as_json,
+          :encode_json,
+        ]
+
+        ##
+        #  Garbage Collection
+        ##
+
+        exclude_singleton_methods GC, [
+          :start
+        ]
+
+        ##
+        #  Unicorn
+        ##
+
+        if defined?(Unicorn)
+          exclude_methods Unicorn::HttpServer, :process_client
+        end
+
+        if defined?(Unicorn::OobGC)
+          exclude_methods Unicorn::OobGC, :process_client
+        end
+
+        ##
+        #  New Relic
+        ##
+
+        if defined?(NewRelic::Agent)
+          if defined?(NewRelic::Agent::Instrumentation::MiddlewareTracing)
+            exclude_methods NewRelic::Agent::Instrumentation::MiddlewareTracing, [
+              :call
+            ]
+          end
+
+          if defined?(NewRelic::Agent::MethodTracerHelpers)
+            exclude_methods NewRelic::Agent::MethodTracerHelpers, [
+              :trace_execution_scoped,
+              :log_errors,
+            ]
+
+            exclude_singleton_methods NewRelic::Agent::MethodTracerHelpers, [
+              :trace_execution_scoped,
+              :log_errors,
+            ]
+          end
+
+          if defined?(NewRelic::Agent::MethodTracer)
+            exclude_methods NewRelic::Agent::MethodTracer, [
+              :trace_execution_scoped,
+              :trace_execution_unscoped,
+            ]
+          end
+        end
+
+          ##
+          #  Miscellaneous Methods
+          ##
+
+        if defined?(Mustache)
+          exclude_methods Mustache::Context, [
+            :fetch
+          ]
+        end
+      end
+
+      private
+
+      def exclude_methods(mod, *method_or_methods)
+        @profile.exclude_methods!(mod, method_or_methods)
+      end
+
+      def exclude_singleton_methods(mod, *method_or_methods)
+        @profile.exclude_singleton_methods!(mod, method_or_methods)
+      end
+
+      def exclude_enumerable(mod, *method_or_methods)
+        exclude_methods(mod, [:each, *method_or_methods])
+        exclude_methods(mod, ENUMERABLE_NAMES)
+      end
+    end
+  end
+end

data/lib/ruby-prof/profile/legacy_method_elimination.rb

@@ -1,49 +1,50 @@
-module RubyProf
-  class Profile
-    module LegacyMethodElimination
-      # eliminate some calls from the graph by merging the information into callers.
-      # matchers can be a list of strings or regular expressions or the name of a file containing regexps.
-      def eliminate_methods!(matchers)
-        RubyProf.deprecation_warning(
-          "Method 'eliminate_methods!' is dprecated",
-          "Please call 'exclude_methods!' before starting the profile run instead."
-        )
-        matchers = read_regexps_from_file(matchers) if matchers.is_a?(String)
-        eliminated = []
-        threads.each do |thread|
-          matchers.each{ |matcher| eliminated.concat(eliminate_methods(thread.methods, matcher)) }
-        end
-        eliminated
-      end
-
-      private
-
-      # read regexps from file
-      def read_regexps_from_file(file_name)
-        matchers = []
-        File.open(file_name).each_line do |l|
-          next if (l =~ /^(#.*|\s*)$/) # emtpy lines and lines starting with #
-          matchers << Regexp.new(l.strip)
-        end
-      end
-
-      # eliminate methods matching matcher
-      def eliminate_methods(methods, matcher)
-        eliminated = []
-        i = 0
-        while i < methods.size
-          method_info = methods[i]
-          method_name = method_info.full_name
-          if matcher === method_name
-            raise "can't eliminate root method" if method_info.root?
-            eliminated << methods.delete_at(i)
-            method_info.eliminate!
-          else
-            i += 1
-          end
-        end
-        eliminated
-      end
-    end
-  end
-end
+module RubyProf
+  class Profile
+    module LegacyMethodElimination
+      # eliminate some calls from the graph by merging the information into callers.
+      # matchers can be a list of strings or regular expressions or the name of a file containing regexps.
+      def eliminate_methods!(matchers)
+        RubyProf.deprecation_warning(
+          "Method 'eliminate_methods!' is deprecated",
+          "Please call 'exclude_methods!' before starting the profile run instead."
+        )
+        matchers = read_regexps_from_file(matchers) if matchers.is_a?(String)
+        eliminated = []
+        threads.each do |thread|
+          matchers.each{ |matcher| eliminated.concat(eliminate_methods(thread.methods, matcher)) }
+        end
+        eliminated
+      end
+
+      private
+
+      # read regexps from file
+      def read_regexps_from_file(file_name)
+        matchers = []
+        File.open(file_name).each_line do |l|
+          next if (l =~ /^(#.*|\s*)$/) # emtpy lines and lines starting with #
+          matchers << Regexp.new(l.strip)
+        end
+        matchers
+      end
+
+      # eliminate methods matching matcher
+      def eliminate_methods(methods, matcher)
+        eliminated = []
+        i = 0
+        while i < methods.size
+          method_info = methods[i]
+          method_name = method_info.full_name
+          if matcher === method_name
+            raise "can't eliminate root method" if method_info.root?
+            eliminated << methods.delete_at(i)
+            method_info.eliminate!
+          else
+            i += 1
+          end
+        end
+        eliminated
+      end
+    end
+  end
+end