From bc76d8a232bed2e245cd3997ebd9826938f7a738 Mon Sep 17 00:00:00 2001 From: hsbt Date: Mon, 11 Mar 2019 11:37:17 +0000 Subject: [PATCH] Removed from standard library. No one maintains it from Ruby 2.0.0. [Bug #15652][ruby-core:91736] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@67215 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- NEWS | 4 + doc/maintainers.rdoc | 4 - doc/standard_library.rdoc | 2 - lib/profile.rb | 11 --- lib/profiler.rb | 149 -------------------------------------- 5 files changed, 4 insertions(+), 166 deletions(-) delete mode 100644 lib/profile.rb delete mode 100644 lib/profiler.rb diff --git a/NEWS b/NEWS index 804e7443d3..a78a2585fa 100644 --- a/NEWS +++ b/NEWS @@ -59,6 +59,10 @@ RSS:: === Stdlib compatibility issues (excluding feature bug fixes) +profile.rb, Profiler__:: + + * Removed from standard library. No one maintains it from Ruby 2.0.0. + === C API updates === Implementation improvements diff --git a/doc/maintainers.rdoc b/doc/maintainers.rdoc index e7baf933c6..d4d657d3cb 100644 --- a/doc/maintainers.rdoc +++ b/doc/maintainers.rdoc @@ -88,10 +88,6 @@ Zachary Scott (zzak) Tanaka Akira (akr) [lib/prettyprint.rb] Tanaka Akira (akr) -[lib/profile.rb] - _unmaintained_ -[lib/profiler.rb] - _unmaintained_ [lib/pstore.rb] _unmaintained_ [lib/racc/*] diff --git a/doc/standard_library.rdoc b/doc/standard_library.rdoc index 09dc61bc52..8f9f6b1761 100644 --- a/doc/standard_library.rdoc +++ b/doc/standard_library.rdoc @@ -32,8 +32,6 @@ Open3:: Provides access to stdin, stdout and stderr when running other programs OptionParser:: Ruby-oriented class for command-line option analysis PP:: Provides a PrettyPrinter for Ruby objects PrettyPrinter:: Implements a pretty printing algorithm for readable structure -profile.rb:: Runs the Ruby Profiler__ -Profiler__:: Provides a way to profile your Ruby application PStore:: Implements a file based persistence mechanism based on a Hash Racc:: A LALR(1) parser generator written in Ruby. RbConfig:: Information of your configure and build of Ruby diff --git a/lib/profile.rb b/lib/profile.rb deleted file mode 100644 index e58c92125b..0000000000 --- a/lib/profile.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true -require 'profiler' - -RubyVM::InstructionSequence.compile_option = { - :trace_instruction => true, - :specialized_instruction => false -} -END { - Profiler__::print_profile(STDERR) -} -Profiler__::start_profile diff --git a/lib/profiler.rb b/lib/profiler.rb deleted file mode 100644 index b3c9f7f46a..0000000000 --- a/lib/profiler.rb +++ /dev/null @@ -1,149 +0,0 @@ -# frozen_string_literal: true -# Profile provides a way to Profile your Ruby application. -# -# Profiling your program is a way of determining which methods are called and -# how long each method takes to complete. This way you can detect which -# methods are possible bottlenecks. -# -# Profiling your program will slow down your execution time considerably, -# so activate it only when you need it. Don't confuse benchmarking with -# profiling. -# -# There are two ways to activate Profiling: -# -# == Command line -# -# Run your Ruby script with -rprofile: -# -# ruby -rprofile example.rb -# -# If you're profiling an executable in your $PATH you can use -# ruby -S: -# -# ruby -rprofile -S some_executable -# -# == From code -# -# Just require 'profile': -# -# require 'profile' -# -# def slow_method -# 5000.times do -# 9999999999999999*999999999 -# end -# end -# -# def fast_method -# 5000.times do -# 9999999999999999+999999999 -# end -# end -# -# slow_method -# fast_method -# -# The output in both cases is a report when the execution is over: -# -# ruby -rprofile example.rb -# -# % cumulative self self total -# time seconds seconds calls ms/call ms/call name -# 68.42 0.13 0.13 2 65.00 95.00 Integer#times -# 15.79 0.16 0.03 5000 0.01 0.01 Fixnum#* -# 15.79 0.19 0.03 5000 0.01 0.01 Fixnum#+ -# 0.00 0.19 0.00 2 0.00 0.00 IO#set_encoding -# 0.00 0.19 0.00 1 0.00 100.00 Object#slow_method -# 0.00 0.19 0.00 2 0.00 0.00 Module#method_added -# 0.00 0.19 0.00 1 0.00 90.00 Object#fast_method -# 0.00 0.19 0.00 1 0.00 190.00 #toplevel - -module Profiler__ - class Wrapper < Struct.new(:defined_class, :method_id, :hash) # :nodoc: - private :defined_class=, :method_id=, :hash= - - def initialize(klass, mid) - super(klass, mid, nil) - self.hash = Struct.instance_method(:hash).bind(self).call - end - - def to_s - "#{defined_class.inspect}#".sub(/\A\##\z/, '\1.') << method_id.to_s - end - alias inspect to_s - end - - # internal values - @@start = nil # the start time that profiling began - @@stacks = nil # the map of stacks keyed by thread - @@maps = nil # the map of call data keyed by thread, class and id. Call data contains the call count, total time, - PROFILE_CALL_PROC = TracePoint.new(*%i[call c_call b_call]) {|tp| # :nodoc: - now = Process.times[0] - stack = (@@stacks[Thread.current] ||= []) - stack.push [now, 0.0] - } - PROFILE_RETURN_PROC = TracePoint.new(*%i[return c_return b_return]) {|tp| # :nodoc: - now = Process.times[0] - key = Wrapper.new(tp.defined_class, tp.method_id) - stack = (@@stacks[Thread.current] ||= []) - if tick = stack.pop - threadmap = (@@maps[Thread.current] ||= {}) - data = (threadmap[key] ||= [0, 0.0, 0.0, key]) - data[0] += 1 - cost = now - tick[0] - data[1] += cost - data[2] += cost - tick[1] - stack[-1][1] += cost if stack[-1] - end - } -module_function - # Starts the profiler. - # - # See Profiler__ for more information. - def start_profile - @@start = Process.times[0] - @@stacks = {} - @@maps = {} - PROFILE_CALL_PROC.enable - PROFILE_RETURN_PROC.enable - end - # Stops the profiler. - # - # See Profiler__ for more information. - def stop_profile - PROFILE_CALL_PROC.disable - PROFILE_RETURN_PROC.disable - end - # Outputs the results from the profiler. - # - # See Profiler__ for more information. - def print_profile(f) - stop_profile - total = Process.times[0] - @@start - if total == 0 then total = 0.01 end - totals = {} - @@maps.values.each do |threadmap| - threadmap.each do |key, data| - total_data = (totals[key] ||= [0, 0.0, 0.0, key]) - total_data[0] += data[0] - total_data[1] += data[1] - total_data[2] += data[2] - end - end - - # Maybe we should show a per thread output and a totals view? - - data = totals.values - data = data.sort_by{|x| -x[2]} - sum = 0 - f.printf " %% cumulative self self total\n" - f.printf " time seconds seconds calls ms/call ms/call name\n" - for d in data - sum += d[2] - f.printf "%6.2f %8.2f %8.2f %8d ", d[2]/total*100, sum, d[2], d[0] - f.printf "%8.2f %8.2f %s\n", d[2]*1000/d[0], d[1]*1000/d[0], d[3] - end - f.printf "%6.2f %8.2f %8.2f %8d ", 0.0, total, 0.0, 1 # ??? - f.printf "%8.2f %8.2f %s\n", 0.0, total*1000, "#toplevel" # ??? - end -end