ruby-prof 0.17.0 → 0.18.0

data/ext/ruby_prof/ruby_prof.h

@@ -1,59 +1,60 @@
-/* Copyright (C) 2005-2013 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
-   Please see the LICENSE file for copyright and distribution information */
-
-#ifndef __RUBY_PROF_H__
-#define __RUBY_PROF_H__
-
-#include <ruby.h>
-#include <stdio.h>
-
-#if RUBY_PROF_RUBY_VERSION == 10806
-# error 1.8.6 is not supported. Please upgrade to 1.9.3 or higher.
-#endif
-
-#if RUBY_PROF_RUBY_VERSION == 10807
-# error 1.8.7 is not supported. Please upgrade to 1.9.3 or higher.
-#endif
-
-#if RUBY_PROF_RUBY_VERSION == 10900
-# error 1.9.0 is not supported. Please upgrade to 1.9.3 or higher.
-#endif
-
-#if RUBY_PROF_RUBY_VERSION == 10901
-# error 1.9.1 is not supported. Please upgrade to 1.9.3 or higher.
-#endif
-
-#if RUBY_PROF_RUBY_VERSION == 10902
-# error 1.9.2 is not supported. Please upgrade to 1.9.3 or higher.
-#endif
-
-#include "rp_measure.h"
-#include "rp_method.h"
-#include "rp_call_info.h"
-#include "rp_stack.h"
-#include "rp_thread.h"
-
-extern VALUE mProf;
-extern VALUE cProfile;
-
-void method_key(prof_method_key_t* key, VALUE klass, ID mid);
-
-typedef struct
-{
-    VALUE running;
-    VALUE paused;
-
-    prof_measurer_t* measurer;
-    VALUE threads;
-
-    st_table* threads_tbl;
-    st_table* exclude_threads_tbl;
-    st_table* include_threads_tbl;
-    st_table* exclude_methods_tbl;
-    thread_data_t* last_thread_data;
-    double measurement_at_pause_resume;
-    int merge_fibers;
-} prof_profile_t;
-
-
-#endif //__RUBY_PROF_H__
+/* Copyright (C) 2005-2019 Shugo Maeda <shugo@ruby-lang.org> and Charlie Savage <cfis@savagexi.com>
+   Please see the LICENSE file for copyright and distribution information */
+
+#ifndef __RUBY_PROF_H__
+#define __RUBY_PROF_H__
+
+#include <ruby.h>
+#include <stdio.h>
+
+#if RUBY_PROF_RUBY_VERSION == 10806
+# error 1.8.6 is not supported. Please upgrade to 1.9.3 or higher.
+#endif
+
+#if RUBY_PROF_RUBY_VERSION == 10807
+# error 1.8.7 is not supported. Please upgrade to 1.9.3 or higher.
+#endif
+
+#if RUBY_PROF_RUBY_VERSION == 10900
+# error 1.9.0 is not supported. Please upgrade to 1.9.3 or higher.
+#endif
+
+#if RUBY_PROF_RUBY_VERSION == 10901
+# error 1.9.1 is not supported. Please upgrade to 1.9.3 or higher.
+#endif
+
+#if RUBY_PROF_RUBY_VERSION == 10902
+# error 1.9.2 is not supported. Please upgrade to 1.9.3 or higher.
+#endif
+
+#include "rp_measure.h"
+#include "rp_method.h"
+#include "rp_call_info.h"
+#include "rp_stack.h"
+#include "rp_thread.h"
+
+extern VALUE mProf;
+extern VALUE cProfile;
+
+void method_key(prof_method_key_t* key, VALUE klass, ID mid);
+
+typedef struct
+{
+    VALUE running;
+    VALUE paused;
+
+    prof_measurer_t* measurer;
+    VALUE threads;
+
+    st_table* threads_tbl;
+    st_table* exclude_threads_tbl;
+    st_table* include_threads_tbl;
+    st_table* exclude_methods_tbl;
+    thread_data_t* last_thread_data;
+    double measurement_at_pause_resume;
+    int merge_fibers;
+    int allow_exceptions;
+} prof_profile_t;
+
+
+#endif //__RUBY_PROF_H__

data/ext/ruby_prof/vc/ruby_prof.sln

@@ -1,32 +1,31 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruby_prof_18", "ruby_prof_18.vcxproj", "{7789FC23-D053-4733-9ED1-D6CE099E1237}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruby_prof_19", "ruby_prof_19.vcxproj", "{5AF7F29A-B100-4D61-95DA-DB21D7C8C1B8}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruby_prof_20", "ruby_prof_20.vcxproj", "{6B4978F4-3B5F-4D38-81A8-069EC28CC069}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28803.452
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ruby_prof", "ruby_prof.vcxproj", "{6B4978F4-3B5F-4D38-81A8-069EC28CC069}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{7789FC23-D053-4733-9ED1-D6CE099E1237}.Debug|Win32.ActiveCfg = Debug|Win32
-		{7789FC23-D053-4733-9ED1-D6CE099E1237}.Debug|Win32.Build.0 = Debug|Win32
-		{7789FC23-D053-4733-9ED1-D6CE099E1237}.Release|Win32.ActiveCfg = Release|Win32
-		{7789FC23-D053-4733-9ED1-D6CE099E1237}.Release|Win32.Build.0 = Release|Win32
-		{5AF7F29A-B100-4D61-95DA-DB21D7C8C1B8}.Debug|Win32.ActiveCfg = Debug|Win32
-		{5AF7F29A-B100-4D61-95DA-DB21D7C8C1B8}.Debug|Win32.Build.0 = Debug|Win32
-		{5AF7F29A-B100-4D61-95DA-DB21D7C8C1B8}.Release|Win32.ActiveCfg = Release|Win32
-		{5AF7F29A-B100-4D61-95DA-DB21D7C8C1B8}.Release|Win32.Build.0 = Release|Win32
-		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Debug|Win32.ActiveCfg = Debug|Win32
-		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Debug|Win32.Build.0 = Debug|Win32
-		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Release|Win32.ActiveCfg = Release|Win32
-		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Release|Win32.Build.0 = Release|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|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
+		{6B4978F4-3B5F-4D38-81A8-069EC28CC069}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {9E7746F2-2467-4738-9746-4472B5CBF1DA}
+	EndGlobalSection
 EndGlobal

data/ext/ruby_prof/vc/{ruby_prof_20.vcxproj → ruby_prof.vcxproj}

@@ -5,15 +5,24 @@
       <Configuration>Debug</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
     <ProjectConfiguration Include="Release|Win32">
       <Configuration>Release</Configuration>
       <Platform>Win32</Platform>
     </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6B4978F4-3B5F-4D38-81A8-069EC28CC069}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>ruby_prof</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -27,6 +36,13 @@
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <PlatformToolset>v142</PlatformToolset>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformToolset>v142</PlatformToolset>
+  </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
   </ImportGroup>
@@ -46,6 +62,10 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>false</LinkIncremental>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <TargetExt>.so</TargetExt>
+    <OutDir>..</OutDir>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PrecompiledHeader>
@@ -80,6 +100,17 @@
       <OptimizeReferences>true</OptimizeReferences>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>C:\msys64\usr\local\ruby263vc\include\ruby-2.6.0\x64-mswin64_140;C:\msys64\usr\local\ruby263vc\include\ruby-2.6.0;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <Optimization>Disabled</Optimization>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>C:\msys64\usr\local\ruby263vc\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>x64-vcruntime140-ruby260.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <ModuleDefinitionFile>ruby_prof.def</ModuleDefinitionFile>
+    </Link>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="..\rp_call_info.h" />
     <ClInclude Include="..\rp_measure.h" />

data/lib/ruby-prof.rb

@@ -1,68 +1,68 @@
-# encoding: utf-8
-
-# Load the C-based binding.
-begin
-  RUBY_VERSION =~ /(\d+\.\d+\.\d+)/
-  require "#{$1}/ruby_prof.so"
-rescue LoadError
-  require "ruby_prof.so"
-end
-
-module RubyProf
-  module DeprecationWarnings
-    def deprecation_warning(feature, recommendation = nil)
-      $stderr.puts "DEPRECATION WARNING: #{feature}"
-      $stderr.puts recommendation unless recommendation.nil?
-    end
-  end
-  extend DeprecationWarnings
-end
-
-require 'ruby-prof/version'
-require 'ruby-prof/call_info'
-require 'ruby-prof/compatibility'
-require 'ruby-prof/method_info'
-require 'ruby-prof/profile'
-require 'ruby-prof/rack'
-require 'ruby-prof/thread'
-
-module RubyProf
-  autoload :AggregateCallInfo, 'ruby-prof/aggregate_call_info'
-  autoload :CallInfoVisitor, 'ruby-prof/call_info_visitor'
-
-  autoload :AbstractPrinter, 'ruby-prof/printers/abstract_printer'
-  autoload :CallInfoPrinter, 'ruby-prof/printers/call_info_printer'
-  autoload :CallStackPrinter, 'ruby-prof/printers/call_stack_printer'
-  autoload :CallTreePrinter, 'ruby-prof/printers/call_tree_printer'
-  autoload :DotPrinter, 'ruby-prof/printers/dot_printer'
-  autoload :FlatPrinter, 'ruby-prof/printers/flat_printer'
-  autoload :FlatPrinterWithLineNumbers, 'ruby-prof/printers/flat_printer_with_line_numbers'
-  autoload :GraphHtmlPrinter, 'ruby-prof/printers/graph_html_printer'
-  autoload :GraphPrinter, 'ruby-prof/printers/graph_printer'
-  autoload :MultiPrinter, 'ruby-prof/printers/multi_printer'
-
-  # Checks if the user specified the clock mode via
-  # the RUBY_PROF_MEASURE_MODE environment variable
-  def self.figure_measure_mode
-    case ENV["RUBY_PROF_MEASURE_MODE"]
-    when "wall", "wall_time"
-      RubyProf.measure_mode = RubyProf::WALL_TIME
-    when "cpu", "cpu_time"
-      RubyProf.measure_mode = RubyProf::CPU_TIME
-    when "allocations"
-      RubyProf.measure_mode = RubyProf::ALLOCATIONS
-    when "memory"
-      RubyProf.measure_mode = RubyProf::MEMORY
-    when "process", "process_time"
-      RubyProf.measure_mode = RubyProf::PROCESS_TIME
-    when "gc_time"
-      RubyProf.measure_mode = RubyProf::GC_TIME
-    when "gc_runs"
-      RubyProf.measure_mode = RubyProf::GC_RUNS
-    else
-      # the default is defined in the measure_mode reader
-    end
-  end
-end
-
-RubyProf::figure_measure_mode
+# encoding: utf-8
+
+# Load the C-based binding.
+begin
+  RUBY_VERSION =~ /(\d+\.\d+\.\d+)/
+  require "#{$1}/ruby_prof.so"
+rescue LoadError
+  require "ruby_prof.so"
+end
+
+module RubyProf
+  module DeprecationWarnings
+    def deprecation_warning(feature, recommendation = nil)
+      $stderr.puts "DEPRECATION WARNING: #{feature}"
+      $stderr.puts recommendation unless recommendation.nil?
+    end
+  end
+  extend DeprecationWarnings
+end
+
+require 'ruby-prof/version'
+require 'ruby-prof/call_info'
+require 'ruby-prof/compatibility'
+require 'ruby-prof/method_info'
+require 'ruby-prof/profile'
+require 'ruby-prof/rack'
+require 'ruby-prof/thread'
+
+module RubyProf
+  autoload :AggregateCallInfo, 'ruby-prof/aggregate_call_info'
+  autoload :CallInfoVisitor, 'ruby-prof/call_info_visitor'
+
+  autoload :AbstractPrinter, 'ruby-prof/printers/abstract_printer'
+  autoload :CallInfoPrinter, 'ruby-prof/printers/call_info_printer'
+  autoload :CallStackPrinter, 'ruby-prof/printers/call_stack_printer'
+  autoload :CallTreePrinter, 'ruby-prof/printers/call_tree_printer'
+  autoload :DotPrinter, 'ruby-prof/printers/dot_printer'
+  autoload :FlatPrinter, 'ruby-prof/printers/flat_printer'
+  autoload :FlatPrinterWithLineNumbers, 'ruby-prof/printers/flat_printer_with_line_numbers'
+  autoload :GraphHtmlPrinter, 'ruby-prof/printers/graph_html_printer'
+  autoload :GraphPrinter, 'ruby-prof/printers/graph_printer'
+  autoload :MultiPrinter, 'ruby-prof/printers/multi_printer'
+
+  # Checks if the user specified the clock mode via
+  # the RUBY_PROF_MEASURE_MODE environment variable
+  def self.figure_measure_mode
+    case ENV["RUBY_PROF_MEASURE_MODE"]
+    when "wall", "wall_time"
+      RubyProf.measure_mode = RubyProf::WALL_TIME
+    when "cpu", "cpu_time"
+      RubyProf.measure_mode = RubyProf::CPU_TIME
+    when "allocations"
+      RubyProf.measure_mode = RubyProf::ALLOCATIONS
+    when "memory"
+      RubyProf.measure_mode = RubyProf::MEMORY
+    when "process", "process_time"
+      RubyProf.measure_mode = RubyProf::PROCESS_TIME
+    when "gc_time"
+      RubyProf.measure_mode = RubyProf::GC_TIME
+    when "gc_runs"
+      RubyProf.measure_mode = RubyProf::GC_RUNS
+    else
+      # the default is defined in the measure_mode reader
+    end
+  end
+end
+
+RubyProf::figure_measure_mode

data/lib/ruby-prof/aggregate_call_info.rb

@@ -1,76 +1,76 @@
-# encoding: utf-8
-
-module RubyProf
-  class AggregateCallInfo
-    attr_reader :call_infos, :method_info
-
-    def initialize(call_infos, method_info)
-      if call_infos.length == 0
-        raise(ArgumentError, "Must specify at least one call info.")
-      end
-      @call_infos = call_infos
-      @method_info = method_info
-    end
-
-    def target
-      call_infos.first.target
-    end
-
-    def parent
-      call_infos.first.parent
-    end
-
-    def line
-      call_infos.first.line
-    end
-
-    def children
-      call_infos.inject(Array.new) do |result, call_info|
-        result.concat(call_info.children)
-      end
-    end
-
-    def total_time
-      aggregate_roots(:total_time)
-    end
-
-    def self_time
-      aggregate_roots(:self_time)
-    end
-
-    def wait_time
-      aggregate_roots(:wait_time)
-    end
-
-    def children_time
-      aggregate_roots(:children_time)
-    end
-
-    def called
-      aggregate_all(:called)
-    end
-
-    def to_s
-      "#{call_infos.first.target.full_name}"
-    end
-
-    private
-
-    # return all call_infos which are not (grand) children of any other node in the list of given call_infos
-    def roots
-      @roots ||= method_info.recursive? ? CallInfo.roots_of(call_infos) : call_infos
-    end
-
-    def aggregate_all(method_name)
-      call_infos.inject(0) do |sum, call_info|
-        sum + call_info.send(method_name)
-      end
-    end
-
-    def aggregate_roots(method_name)
-      roots.inject(0) do |sum, call_info|
-        sum + call_info.send(method_name)
-      end
-    end
-  end
-end
+# encoding: utf-8
+
+module RubyProf
+  class AggregateCallInfo
+    attr_reader :call_infos, :method_info
+
+    def initialize(call_infos, method_info)
+      if call_infos.length == 0
+        raise(ArgumentError, "Must specify at least one call info.")
+      end
+      @call_infos = call_infos
+      @method_info = method_info
+    end
+
+    def target
+      call_infos.first.target
+    end
+
+    def parent
+      call_infos.first.parent
+    end
+
+    def line
+      call_infos.first.line
+    end
+
+    def children
+      call_infos.inject(Array.new) do |result, call_info|
+        result.concat(call_info.children)
+      end
+    end
+
+    def total_time
+      aggregate_roots(:total_time)
+    end
+
+    def self_time
+      aggregate_roots(:self_time)
+    end
+
+    def wait_time
+      aggregate_roots(:wait_time)
+    end
+
+    def children_time
+      aggregate_roots(:children_time)
+    end
+
+    def called
+      aggregate_all(:called)
+    end
+
+    def to_s
+      "#{call_infos.first.target.full_name}"
+    end
+
+    private
+
+    # return all call_infos which are not (grand) children of any other node in the list of given call_infos
+    def roots
+      @roots ||= method_info.recursive? ? CallInfo.roots_of(call_infos) : call_infos
+    end
+
+    def aggregate_all(method_name)
+      call_infos.inject(0) do |sum, call_info|
+        sum + call_info.send(method_name)
+      end
+    end
+
+    def aggregate_roots(method_name)
+      roots.inject(0) do |sum, call_info|
+        sum + call_info.send(method_name)
+      end
+    end
+  end
+end