ruby-prof 1.3.1 → 1.4.3

data/ext/ruby_prof/rp_profile.h

@@ -26,7 +26,6 @@ typedef struct prof_profile_t
     thread_data_t* last_thread_data;
     double measurement_at_pause_resume;
     bool allow_exceptions;
-    bool merge_fibers;
 } prof_profile_t;
 
 void rp_init_profile(void);

data/ext/ruby_prof/rp_stack.c

@@ -22,6 +22,14 @@ void prof_stack_free(prof_stack_t* stack)
     xfree(stack);
 }
 
+prof_frame_t* prof_stack_parent(prof_stack_t* stack)
+{
+    if (stack->ptr == stack->start || stack->ptr - 1 == stack->start)
+        return NULL;
+    else
+        return stack->ptr - 2;
+}
+
 prof_frame_t* prof_stack_last(prof_stack_t* stack)
 {
     if (stack->ptr == stack->start)
@@ -86,8 +94,8 @@ prof_frame_t* prof_frame_current(prof_stack_t* stack)
 
 prof_frame_t* prof_frame_push(prof_stack_t* stack, prof_call_tree_t* call_tree, double measurement, bool paused)
 {
-    prof_frame_t* parent_frame = prof_stack_last(stack);
     prof_frame_t* result = prof_stack_push(stack);
+    prof_frame_t* parent_frame = prof_stack_parent(stack);
 
     result->call_tree = call_tree;
 
@@ -129,7 +137,7 @@ prof_frame_t* prof_frame_push(prof_stack_t* stack, prof_call_tree_t* call_tree,
 prof_frame_t* prof_frame_unshift(prof_stack_t* stack, prof_call_tree_t* parent_call_tree, prof_call_tree_t* call_tree, double measurement)
 {
     if (prof_stack_last(stack))
-        rb_raise(rb_eRuntimeError, "Stach unshift can only be called with an empty stack");
+        rb_raise(rb_eRuntimeError, "Stack unshift can only be called with an empty stack");
 
     parent_call_tree->measurement->total_time = call_tree->measurement->total_time;
     parent_call_tree->measurement->self_time = 0;
@@ -172,7 +180,7 @@ prof_frame_t* prof_frame_pop(prof_stack_t* stack, double measurement)
         call_tree->measurement->total_time += total_time;
 
     call_tree->visits--;
-    
+
     prof_frame_t* parent_frame = prof_stack_last(stack);
     if (parent_frame)
     {
@@ -187,7 +195,7 @@ prof_frame_t* prof_frame_pop(prof_stack_t* stack, double measurement)
 
 prof_method_t* prof_find_method(prof_stack_t* stack, VALUE source_file, int source_line)
 {
-    prof_frame_t* frame = stack->ptr;
+    prof_frame_t* frame = prof_stack_last(stack);
     while (frame >= stack->start)
     {
         if (!frame->call_tree)

data/ext/ruby_prof/rp_thread.c

@@ -21,7 +21,7 @@ You cannot create an instance of RubyProf::Thread, instead you access it from a
 
 VALUE cRpThread;
 
-// ======   thread_data_t  ====== 
+// ======   thread_data_t  ======
 thread_data_t* thread_data_create(void)
 {
     thread_data_t* result = ALLOC(thread_data_t);
@@ -146,7 +146,7 @@ thread_data_t* prof_get_thread(VALUE self)
 }
 
 // ======   Thread Table  ======
-// The thread table is hash keyed on ruby fiber_id that stores instances of thread_data_t. 
+// The thread table is hash keyed on ruby fiber_id that stores instances of thread_data_t.
 
 st_table* threads_table_create()
 {

data/ext/ruby_prof/vc/ruby_prof.sln

@@ -7,16 +7,24 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruby_prof", "ruby_prof.vcxp
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Debug|ARM64 = Debug|ARM64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|ARM = Release|ARM
+		Release|ARM64 = Release|ARM64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Debug|ARM.ActiveCfg = Debug|Win32
+		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Debug|ARM64.ActiveCfg = Debug|Win32
 		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Debug|x64.ActiveCfg = Debug|x64
 		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Debug|x64.Build.0 = Debug|x64
 		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Debug|x86.ActiveCfg = Debug|Win32
 		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Debug|x86.Build.0 = Debug|Win32
+		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Release|ARM.ActiveCfg = Release|Win32
+		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Release|ARM64.ActiveCfg = Release|Win32
 		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Release|x64.ActiveCfg = Release|x64
 		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Release|x64.Build.0 = Release|x64
 		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Release|x86.ActiveCfg = Release|Win32

data/ext/ruby_prof/vc/ruby_prof.vcxproj

@@ -64,7 +64,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetExt>.so</TargetExt>
-    <OutDir>..\..\..\lib</OutDir>
+    <OutDir>..\..\..\lib\</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -102,17 +102,28 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <ClCompile>
-      <AdditionalIncludeDirectories>C:\msys64\usr\local\ruby-2.7.0vc\include\ruby-2.7.0\x64-mswin64_140;C:\msys64\usr\local\ruby-2.7.0vc\include\ruby-2.7.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\msys64\usr\local\ruby-2.7.2vc\include\ruby-2.7.0\x64-mswin64_140;C:\msys64\usr\local\ruby-2.7.2vc\include\ruby-2.7.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>HAVE_RB_TRACEARG_CALLEE_ID;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <WarningLevel>Level3</WarningLevel>
     </ClCompile>
     <Link>
-      <AdditionalLibraryDirectories>C:\msys64\usr\local\ruby-2.7.0vc\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>C:\msys64\usr\local\ruby-2.7.2vc\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <AdditionalDependencies>x64-vcruntime140-ruby270.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <ModuleDefinitionFile>ruby_prof.def</ModuleDefinitionFile>
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\msys64\usr\local\ruby-2.7.1vc\include\ruby-2.7.0\x64-mswin64_140;C:\msys64\usr\local\ruby-2.7.1vc\include\ruby-2.7.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>C:\msys64\usr\local\ruby-2.7.1vc\lib</AdditionalLibraryDirectories>
+      <AdditionalDependencies>x64-vcruntime140-ruby270.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>ruby_prof.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\rp_aggregate_call_tree.h" />
     <ClInclude Include="..\rp_allocation.h" />

data/lib/ruby-prof.rb

@@ -1,11 +1,12 @@
 # encoding: utf-8
+require 'rubygems/version'
 
 # Load the C-based binding.
 begin
-  RUBY_VERSION =~ /(\d+\.\d+\.\d+)/
-  require "#{$1}/ruby_prof.so"
+  version = Gem::Version.new(RUBY_VERSION)
+  require "#{version.segments[0..1].join('.')}/ruby_prof.so"
 rescue LoadError
-  require "ruby_prof.so"
+  require_relative "../ext/ruby_prof/ruby_prof.so"
 end
 
 require 'ruby-prof/version'

data/lib/ruby-prof/compatibility.rb

@@ -81,16 +81,6 @@ module RubyProf
     Profile.profile(options, &block)
   end
 
-  # :nodoc:
-  def self.measure_mode_string
-    case measure_mode
-      when WALL_TIME    then "wall_time"
-      when PROCESS_TIME then "process_time"
-      when ALLOCATIONS  then "allocations"
-      when MEMORY       then "memory"
-    end
-  end
-
   # :nodoc:
   def self.start_script(script)
     start

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

@@ -99,7 +99,7 @@ module RubyProf
     end
 
     def print_header(thread)
-      @output << "Measure Mode: %s\n" % RubyProf.measure_mode_string
+      @output << "Measure Mode: %s\n" % @result.measure_mode_string
       @output << "Thread ID: %d\n" % thread.id
       @output << "Fiber ID: %d\n" % thread.fiber_id unless thread.id == thread.fiber_id
       @output << "Total: %0.6f\n" % thread.total_time
@@ -113,7 +113,7 @@ module RubyProf
 
     def print_footer(thread)
       @output << <<~EOT
-      
+
         * recursively called methods
 
         Columns are:

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

@@ -4,6 +4,7 @@ require 'erb'
 require 'fileutils'
 require 'base64'
 require 'set'
+require 'stringio'
 
 module RubyProf
   # Prints a HTML visualization of the call tree.

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

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

data/lib/ruby-prof/profile.rb

@@ -7,10 +7,14 @@ module RubyProf
     # :nodoc:
     def measure_mode_string
       case self.measure_mode
-        when WALL_TIME    then "wall_time"
-        when PROCESS_TIME then "process_time"
-        when ALLOCATIONS  then "allocations"
-        when MEMORY       then "memory"
+        when WALL_TIME
+          "wall_time"
+        when PROCESS_TIME
+          "process_time"
+        when ALLOCATIONS
+          "allocations"
+        when MEMORY
+          "memory"
       end
     end
 

data/lib/ruby-prof/rack.rb

@@ -5,43 +5,37 @@ module Rack
   class RubyProf
     def initialize(app, options = {})
       @app = app
+      @options = options
+      @options[:min_percent] ||= 1
 
-      options[:min_percent] ||= 1
+      @tmpdir = options[:path] || Dir.tmpdir
+      FileUtils.mkdir_p(@tmpdir)
 
-      options[:path] ||= Dir.tmpdir
-      FileUtils.mkdir_p(options[:path])
+      @printer_klasses = @options[:printers]  || {::RubyProf::FlatPrinter => 'flat.txt',
+                                                  ::RubyProf::GraphPrinter => 'graph.txt',
+                                                  ::RubyProf::GraphHtmlPrinter => 'graph.html',
+                                                  ::RubyProf::CallStackPrinter => 'call_stack.html'}
 
       @skip_paths = options[:skip_paths] || [%r{^/assets}, %r{\.(css|js|png|jpeg|jpg|gif)$}]
       @only_paths = options[:only_paths]
-
-      @max_requests = options[:max_requests]
-
-      @options = options
     end
 
     def call(env)
       request = Rack::Request.new(env)
 
       if should_profile?(request.path)
-        profiler.resume
         begin
-          result = @app.call(env)
-        ensure
-          profiler.pause
-        end
+          result = nil
+          data = ::RubyProf::Profile.profile(profiling_options) do
+            result = @app.call(env)
+          end
 
-        if profiler.max_requests_reached?
-          prefix = if aggregate_requests?
-              nil
-            else
-              request.path.gsub('/', '-')[1..-1]
-            end
+          path = request.path.gsub('/', '-')
+          path.slice!(0)
 
-          profiler.print!(prefix)
-          delete_profiler!
+          print(data, path)
+          result
         end
-
-        result
       else
         @app.call(env)
       end
@@ -49,126 +43,53 @@ module Rack
 
     private
 
-    class RackProfiler
-      def initialize(options)
-        @options = options
-
-        @profile = ::RubyProf::Profile.new(profiling_options)
-        @profile.start
-        @profile.pause
-
-        @printer_klasses = options[:printers] || default_printers
-
-        @tmpdir = options[:path]
-
-        @max_requests = options[:max_requests] || 1
-        @requests_count = 0
+    def should_profile?(path)
+      return false if paths_match?(path, @skip_paths)
 
-        @printed = false
-        # if running across multiple requests, we want to make sure that the
-        # ongoing profile is not lost if the process shuts down before the
-        # max request count is reached
-        ObjectSpace.define_finalizer(self, proc { print! })
-      end
+      @only_paths ? paths_match?(path, @only_paths) : true
+    end
 
-      def resume
-        @profile.resume
-      end
+    def paths_match?(path, paths)
+      paths.any? { |skip_path| skip_path =~ path }
+    end
 
-      def pause
-        @profile.pause
-        @requests_count += 1
+    def profiling_options
+      options = {}
+      options[:measure_mode] = ::RubyProf.measure_mode
+      options[:exclude_threads] =
+        if @options[:ignore_existing_threads]
+          Thread.list.select{|t| t != Thread.current}
+        else
+          ::RubyProf.exclude_threads
+        end
+      if @options[:request_thread_only]
+        options[:include_threads] = [Thread.current]
       end
-
-      def max_requests_reached?
-        @requests_count >= @max_requests
+      if @options[:merge_fibers]
+        options[:merge_fibers] = true
       end
+      options
+    end
 
-      def print!(prefix = nil)
-        return false if @printed || @requests_count == 0
-
-        data = @profile.stop
-
-        prefix ||= "multi-requests-#{@requests_count}"
-
-        @printer_klasses.each do |printer_klass, base_name|
-          printer = printer_klass.new(data)
-
-          if base_name.respond_to?(:call)
-            base_name = base_name.call
-          end
+    def print(data, path)
+      @printer_klasses.each do |printer_klass, base_name|
+        printer = printer_klass.new(data)
 
-          if printer_klass == ::RubyProf::MultiPrinter \
-              || printer_klass == ::RubyProf::CallTreePrinter
-            printer.print(@options.merge(:profile => "#{prefix}-#{base_name}"))
-          else
-            file_name = ::File.join(@tmpdir, "#{prefix}-#{base_name}")
-            ::File.open(file_name, 'wb') do |file|
-              printer.print(file, @options)
-            end
-          end
+        if base_name.respond_to?(:call)
+          base_name = base_name.call
         end
 
-        @printed = true
-      end
-
-      private
-
-      def profiling_options
-        options = {}
-        options[:measure_mode] = ::RubyProf.measure_mode
-        options[:exclude_threads] =
-          if @options[:ignore_existing_threads]
-            Thread.list.select{|t| t != Thread.current}
-          else
-            ::RubyProf.exclude_threads
+        if printer_klass == ::RubyProf::MultiPrinter
+          printer.print(@options.merge(:profile => "#{path}-#{base_name}"))
+        elsif printer_klass == ::RubyProf::CallTreePrinter
+          printer.print(@options.merge(:profile => "#{path}-#{base_name}"))
+        else
+          file_name = ::File.join(@tmpdir, "#{path}-#{base_name}")
+          ::File.open(file_name, 'wb') do |file|
+            printer.print(file, @options)
           end
-        if @options[:request_thread_only]
-          options[:include_threads] = [Thread.current]
         end
-        if @options[:merge_fibers]
-          options[:merge_fibers] = true
-        end
-        options
-      end
-
-      def default_printers
-        {::RubyProf::FlatPrinter => 'flat.txt',
-         ::RubyProf::GraphPrinter => 'graph.txt',
-         ::RubyProf::GraphHtmlPrinter => 'graph.html',
-         ::RubyProf::CallStackPrinter => 'call_stack.html'}
       end
     end
-
-    def profiler
-      if aggregate_requests?
-        @@_shared_profiler ||= RackProfiler.new(@options)
-      else
-        @_profiler ||= RackProfiler.new(@options)
-      end
-    end
-
-    def delete_profiler!
-      if aggregate_requests?
-        @@_shared_profiler.print! if @@_shared_profiler
-        @@_shared_profiler = nil
-      else
-        @_profiler = nil
-      end
-    end
-
-    def aggregate_requests?
-      !@max_requests.nil?
-    end
-
-    def should_profile?(path)
-      return false if paths_match?(path, @skip_paths)
-
-      @only_paths ? paths_match?(path, @only_paths) : true
-    end
-
-    def paths_match?(path, paths)
-      paths.any? { |skip_path| skip_path =~ path }
-    end
   end
 end