ruby-prof 1.4.2-x64-mingw32 → 1.4.3-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73600e70119580caad0f948db3b7140018caefc19479b564d74162b978c95bd1
-  data.tar.gz: 227e85a005cc3e043ccd81b13d44aea555dd038f7506e683c48cead1ff2c7e33
+  metadata.gz: ff6376af9ff0bca0c82428adbe82fac0b61baaa885ec1c0838f00615b473c5a5
+  data.tar.gz: 5501219e23555b6b4d695e3539ea65ef1491f5387ed19be63e8ccda546196304
 SHA512:
-  metadata.gz: 1af26fb86402e3d42fc9cac2c0657d14b74e0b0ff11424ffce1ae7f747d3583d135474ee77a9a70ed3f47768232f70a8d21aab868151075c93d5e61bfd2bf7ce
-  data.tar.gz: e34707b1a27a4da44897f19476dcdf5d1570662f10a897bb28397c70d4b3241eac64eff14bf2ebed7d9f4fd0436a82d4b2ae9652bcd803f00586e3ad66cb915a
+  metadata.gz: f177dccca89487aad943de3b049b40929c2576fcda0fc05e6c41cbcbef99b78e9c42717297341edf15bafd78da8596b2d5a44522a899ddf7437645f621aae9c2
+  data.tar.gz: 0450be219e2a2caa86c75ecccb8384ecfcb4293aff82e4a6b3a7165b8a09bad25cc9e4629d0d0340887a455e854d0e42d432b4f96ba13c359adcf4ad424e54a8

data/CHANGES

@@ -1,3 +1,16 @@
+1.4.3 (2021-02-15)
+=====================
+* Remove trailing spaces (sergioro)
+* Enable loading ruby_prof.so from ext directory for development purposes (sergioro)
+* Create temp directory for test output (sergioro)
+* Fix minitest warning about using MT_CPU instead of N (sergioro)
+* Fix minitest warning "Use assert_nil if expecting nil"  (sergioro)
+* Fix file permissions (sergioro)
+* Fix failing test by forcing GC to run (Charlie Savage)
+* Switch to GitHub actions (Charlie Savage)
+* Switch to C11 (Charlie Savage)
+* Greatly slim down library size by removing symbols on GCC (Charlie Savage)
+
 1.4.2 (2020-11-3)
 =====================
 * Do NOT use Ruby 2.7.0 and 2.7.1 with ruby-prof. A bug in those versions of ruby causes ruby-prof to

data/README.rdoc

@@ -1,5 +1,5 @@
 = ruby-prof
 
-{<img src="https://travis-ci.org/ruby-prof/ruby-prof.png?branch=master" alt="Build Status" />}[https://travis-ci.org/ruby-prof/ruby-prof]
+![ruby-prof](https://github.com/ruby-prof/ruby-prof/workflows/ruby-prof/badge.svg)
 
 For an overview of ruby-prof please see https://ruby-prof.github.io

data/ext/ruby_prof/extconf.rb

@@ -1,11 +1,17 @@
 require "mkmf"
 
-# This function was added in Ruby 2.5, so once Ruby 2.4 is no longer supported this can be removed
-have_func('rb_tracearg_callee_id', ["ruby.h"])
+# Let's go with a modern version of C! want to intermix declarations and code (ie, don't define
+# all variables at the top of the method). If using Visual Studio, you'll need 2019 version
+# 16.8 or higher
+if RUBY_PLATFORM =~ /mswin/
+  $CFLAGS += ' /std:c11'
+else
+  $CFLAGS += ' -std=c11'
+end
 
-# We want to intermix declarations and code (ie, don't define all variables at the top of the method)
-unless RUBY_PLATFORM =~ /mswin/
-  $CFLAGS += ' -std=c99'
+# For gcc add -s to strip symbols, reducing library size from 17MB to 78KB (at least on Windows with mingw64)
+if RUBY_PLATFORM !~ /mswin/
+  $LDFLAGS += ' -s'
 end
 
 # And since we are using C99 we want to disable Ruby sending these warnings to gcc

data/ext/ruby_prof/rp_allocation.c

@@ -141,7 +141,7 @@ static const rb_data_type_t allocation_type =
     },
     .data = NULL,
     .flags = RUBY_TYPED_FREE_IMMEDIATELY
-}; 
+};
 
 VALUE prof_allocation_wrap(prof_allocation_t* allocation)
 {

data/ext/ruby_prof/rp_measurement.c

@@ -100,7 +100,7 @@ static const rb_data_type_t measurement_type =
     },
     .data = NULL,
     .flags = RUBY_TYPED_FREE_IMMEDIATELY
-}; 
+};
 
 VALUE prof_measurement_wrap(prof_measurement_t* measurement)
 {

data/ext/ruby_prof/rp_method.c

@@ -253,7 +253,7 @@ static const rb_data_type_t method_info_type =
     },
     .data = NULL,
     .flags = RUBY_TYPED_FREE_IMMEDIATELY
-}; 
+};
 
 VALUE prof_method_wrap(prof_method_t* method)
 {
@@ -488,4 +488,4 @@ void rp_init_method_info()
 
     rb_define_method(cRpMethodInfo, "_dump_data", prof_method_dump, 0);
     rb_define_method(cRpMethodInfo, "_load_data", prof_method_load, 1);
-}
+}

data/ext/ruby_prof/rp_method.h

@@ -9,35 +9,35 @@
 
 extern VALUE cRpMethodInfo;
 
-// Source relation bit offsets. 
+// Source relation bit offsets.
 enum {
-    kModuleIncludee = 0x1,                    // Included in module 
-    kClassSingleton = 0x2,                    // Singleton of a class 
-    kModuleSingleton = 0x4,                   // Singleton of a module 
-    kObjectSingleton = 0x8,                   // Singleton of an object 
-    kOtherSingleton = 0x10                    // Singleton of unkown object 
+    kModuleIncludee = 0x1,                    // Included in module
+    kClassSingleton = 0x2,                    // Singleton of a class
+    kModuleSingleton = 0x4,                   // Singleton of a module
+    kObjectSingleton = 0x8,                   // Singleton of an object
+    kOtherSingleton = 0x10                    // Singleton of unkown object
 };
 
-// Profiling information for each method. 
-// Excluded methods have no call_trees, source_klass, or source_file. 
+// Profiling information for each method.
+// Excluded methods have no call_trees, source_klass, or source_file.
 typedef struct prof_method_t
 {
     VALUE profile;                          // Profile this method is associated with - needed for mark phase
-    struct prof_call_trees_t* call_trees;   // Call infos that call this method 
-    st_table* allocations_table;            // Tracks object allocations 
+    struct prof_call_trees_t* call_trees;   // Call infos that call this method
+    st_table* allocations_table;            // Tracks object allocations
 
-    st_data_t key;                          // Table key 
-    unsigned int klass_flags;               // Information about the type of class 
-    VALUE klass;                            // Resolved klass 
-    VALUE klass_name;                       // Resolved klass name for this method 
-    VALUE method_name;                      // Resolved method name for this method 
+    st_data_t key;                          // Table key
+    unsigned int klass_flags;               // Information about the type of class
+    VALUE klass;                            // Resolved klass
+    VALUE klass_name;                       // Resolved klass name for this method
+    VALUE method_name;                      // Resolved method name for this method
 
-    VALUE object;                           // Cached ruby object 
+    VALUE object;                           // Cached ruby object
 
     bool recursive;
-    int visits;                             // Current visits on the stack 
-    VALUE source_file;                      // Source file 
-    int source_line;                        // Line number 
+    int visits;                             // Current visits on the stack
+    VALUE source_file;                      // Source file
+    int source_line;                        // Line number
 
     prof_measurement_t* measurement;        // Stores measurement data for this method
 } prof_method_t;

data/ext/ruby_prof/rp_profile.c

@@ -138,11 +138,7 @@ prof_method_t* check_method(VALUE profile, rb_trace_arg_t* trace_arg, rb_event_f
     if (klass == cProfile)
         return NULL;
 
-#ifdef HAVE_RB_TRACEARG_CALLEE_ID
     VALUE msym = rb_tracearg_callee_id(trace_arg);
-#else
-    VALUE msym = rb_tracearg_method_id(trace_arg);
-#endif
 
     st_data_t key = method_key(klass, msym);
 
@@ -158,7 +154,7 @@ prof_method_t* check_method(VALUE profile, rb_trace_arg_t* trace_arg, rb_event_f
         int source_line = (event != RUBY_EVENT_C_CALL ? FIX2INT(rb_tracearg_lineno(trace_arg)) : 0);
         result = create_method(profile, key, klass, msym, source_file, source_line);
     }
-    
+
     return result;
 }
 
@@ -174,11 +170,7 @@ static void prof_trace(prof_profile_t* profile, rb_trace_arg_t* trace_arg, doubl
     VALUE source_file = rb_tracearg_path(trace_arg);
     int source_line = FIX2INT(rb_tracearg_lineno(trace_arg));
 
-#ifdef HAVE_RB_TRACEARG_CALLEE_ID
     VALUE msym = rb_tracearg_callee_id(trace_arg);
-#else
-    VALUE msym = rb_tracearg_method_id(trace_arg);
-#endif
 
     unsigned int klass_flags;
     VALUE klass = rb_tracearg_defined_class(trace_arg);
@@ -253,13 +245,13 @@ static void prof_event_hook(VALUE trace_point, void* data)
                 {
                     frame = prof_frame_push(thread_data->stack, call_tree, measurement, RTEST(profile_t->paused));
                 }
-                
+
                 thread_data->call_tree = call_tree;
             }
-            
+
             frame->source_file = rb_tracearg_path(trace_arg);
             frame->source_line = FIX2INT(rb_tracearg_lineno(trace_arg));
-            
+
             break;
         }
         case RUBY_EVENT_CALL:
@@ -282,7 +274,7 @@ static void prof_event_hook(VALUE trace_point, void* data)
             }
             else if (!frame && thread_data->call_tree)
             {
-                // There is no current parent - likely we have returned out of the highest level method we have profiled so far. 
+                // There is no current parent - likely we have returned out of the highest level method we have profiled so far.
                 // This can happen with enumerators (see fiber_test.rb). So create a new dummy parent.
                 prof_method_t* parent_method = check_parent_method(profile, thread_data);
                 parent_call_tree = prof_call_tree_create(parent_method, NULL, Qnil, 0);
@@ -421,7 +413,7 @@ static void prof_profile_mark(void* data)
         rb_st_foreach(profile->exclude_methods_tbl, prof_profile_mark_methods, 0);
 }
 
-/* Freeing the profile creates a cascade of freeing. It frees its threads table, which frees 
+/* Freeing the profile creates a cascade of freeing. It frees its threads table, which frees
    each thread and its associated call treee and methods. */
 static void prof_profile_ruby_gc_free(void* data)
 {

data/ext/ruby_prof/rp_stack.c

@@ -180,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)
     {

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.vcxproj

@@ -104,7 +104,7 @@
     <ClCompile>
       <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>

data/lib/ruby-prof.rb

@@ -6,7 +6,7 @@ begin
   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/printers/abstract_printer.rb

@@ -113,7 +113,7 @@ module RubyProf
 
     def print_footer(thread)
       @output << <<~EOT
-      
+
         * recursively called methods
 
         Columns are:

data/lib/ruby-prof/version.rb

@@ -1,3 +1,3 @@
 module RubyProf
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/ruby-prof.gemspec

@@ -56,7 +56,7 @@ EOF
                    'test/*.rb']
 
   spec.test_files = Dir["test/test_*.rb"]
-  spec.required_ruby_version = '>= 2.4.0'
+  spec.required_ruby_version = '>= 2.5.0'
   spec.date = Time.now.strftime('%Y-%m-%d')
   spec.homepage = 'https://github.com/ruby-prof/ruby-prof'
   spec.add_development_dependency('minitest')

data/test/gc_test.rb

@@ -29,6 +29,8 @@ class GcTest < TestCase
       array
     end
 
+    GC.start
+
     threads.each do |thread|
       refute_nil(thread.id)
     end
@@ -42,6 +44,8 @@ class GcTest < TestCase
       array
     end
 
+    GC.start
+
     methods.each do |method|
       refute_nil(method.method_name)
     end
@@ -55,6 +59,8 @@ class GcTest < TestCase
       array
     end
 
+    GC.start
+
     method_call_infos.each do |call_trees|
       refute_empty(call_trees.call_trees)
     end
@@ -63,11 +69,13 @@ class GcTest < TestCase
   def test_hold_onto_measurements
     measurements = 5.times.reduce(Array.new) do |array, i|
       profile = run_profile
-      measurements = profile.threads.map(&:methods).flatten.map(&:measurement)
-      array.concat(measurements)
+      measurements_2 = profile.threads.map(&:methods).flatten.map(&:measurement)
+      array.concat(measurements_2)
       array
     end
 
+    GC.start
+
     measurements.each do |measurement|
       error = assert_raises(RuntimeError) do
         measurement.total_time
@@ -83,6 +91,8 @@ class GcTest < TestCase
       array
     end
 
+    GC.start
+
     call_trees.each do |call_tree|
       refute_nil(call_tree.source_file)
     end

data/test/marshal_test.rb

@@ -35,7 +35,13 @@ class MarshalTest < TestCase
 
       assert_equal(method_1.recursive?, method_2.recursive?)
 
-      assert_equal(method_1.source_file, method_2.source_file)
+      if method_1.source_file
+        assert_equal(method_1.source_file, method_2.source_file)
+      else
+        assert_nil(method_1.source_file)
+        assert_nil(method_2.source_file)
+      end
+
       assert_equal(method_1.line, method_2.line)
 
       verify_measurement(method_1.measurement, method_2.measurement)
@@ -73,10 +79,23 @@ class MarshalTest < TestCase
 
   def verify_call_info(call_info_1, call_info_2)
     assert_equal(call_info_1.target, call_info_2.target)
-    assert_equal(call_info_1.parent&.target, call_info_2.parent&.target)
+
+    if call_info_1.parent&.target
+      assert_equal(call_info_1.parent&.target, call_info_2.parent&.target)
+    else
+      assert_nil(call_info_1.parent&.target)
+      assert_nil(call_info_2.parent&.target)
+    end
 
     assert_equal(call_info_1.depth, call_info_2.depth)
-    assert_equal(call_info_1.source_file, call_info_2.source_file)
+
+    if call_info_1.source_file
+      assert_equal(call_info_1.source_file, call_info_2.source_file) #
+    else
+      assert_nil(call_info_1.source_file)
+      assert_nil(call_info_2.source_file)
+    end
+
     assert_equal(call_info_1.line, call_info_2.line)
 
     verify_measurement(call_info_1.measurement, call_info_2.measurement)

data/test/measure_memory_trace_test.rb

@@ -36,7 +36,7 @@ class MeasureMemoryTraceTest < TestCase
       assert_in_delta(800, method.children_time, 1)
 
       assert_equal(0, method.call_trees.callers.length)
-  
+
       assert_equal(2, method.call_trees.callees.length)
       call_tree = method.call_trees.callees[0]
       assert_equal('Class#new', call_tree.target.full_name)
@@ -738,7 +738,7 @@ class MeasureMemoryTraceTest < TestCase
 
       assert_equal(0.0, method.call_trees.callees.length)
     end
-  else
+  elsif Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0')
     def test_memory
       result = RubyProf.profile do
         allocator = Allocator.new
@@ -1095,6 +1095,365 @@ class MeasureMemoryTraceTest < TestCase
       assert_equal(0.0, call_tree.self_time)
       assert_equal(0.0, call_tree.children_time)
 
+      assert_equal(0.0, method.call_trees.callees.length)
+    end
+  else
+    def test_memory
+      result = RubyProf.profile do
+        allocator = Allocator.new
+        allocator.run
+      end
+
+      thread = result.threads.first
+
+      assert_in_delta(1680, thread.total_time, 1)
+      methods = result.threads.first.methods.sort.reverse
+      assert_equal(13, methods.length)
+
+      # Method 0
+      method = methods[0]
+      assert_equal('MeasureMemoryTraceTest#test_memory',  method.full_name)
+      assert_in_delta(1680, method.total_time, 1)
+
+      assert_equal(0.0, method.wait_time)
+      assert_equal(80.0, method.self_time)
+      assert_in_delta(1600, method.children_time, 1)
+      assert_equal(0, method.call_trees.callers.length)
+
+      assert_equal(2, method.call_trees.callees.length)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Class#new', call_tree.target.full_name)
+      assert_equal(40.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callees[1]
+      assert_equal('Allocator#run', call_tree.target.full_name)
+      assert_equal(1560.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(1520.0, call_tree.children_time)
+
+      # Method 1
+      method = methods[1]
+      assert_equal('Allocator#run',method.full_name)
+      assert_equal(1560.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(40.0, method.self_time)
+      assert_equal(1520.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('MeasureMemoryTraceTest#test_memory', call_tree.parent.target.full_name)
+      assert_equal(1560.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(1520.0, call_tree.children_time)
+
+      assert_equal(1, method.call_trees.callees.length)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Allocator#internal_run', call_tree.target.full_name)
+      assert_equal(1520.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(120.0, call_tree.self_time)
+      assert_equal(1400.0, call_tree.children_time)
+
+      # Method 2
+      method = methods[2]
+      assert_equal('Allocator#internal_run',  method.full_name)
+      assert_equal(1520.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(120.0, method.self_time)
+      assert_equal(1400.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Allocator#run', call_tree.parent.target.full_name)
+      assert_equal(1520.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(120.0, call_tree.self_time)
+      assert_equal(1400.0, call_tree.children_time)
+
+      assert_equal(3, method.call_trees.callees.length)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Allocator#make_arrays', call_tree.target.full_name)
+      assert_equal(400.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(400.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callees[1]
+      assert_equal('Allocator#make_hashes', call_tree.target.full_name)
+      assert_equal(840.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(840.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callees[2]
+      assert_equal('Allocator#make_strings', call_tree.target.full_name)
+      assert_equal(160.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40, call_tree.self_time)
+      assert_equal(120.0, call_tree.children_time)
+
+      # Method 3
+      method = methods[3]
+      assert_equal('Class#new', method.full_name)
+      assert_equal(1360.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(1320.0, method.self_time)
+      assert_equal(40.0, method.children_time)
+
+      assert_equal(4, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('MeasureMemoryTraceTest#test_memory', call_tree.parent.target.full_name)
+      assert_equal(40.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callers[1]
+      assert_equal('Integer#times', call_tree.parent.target.full_name)
+      assert_equal(400.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(400.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callers[2]
+      assert_equal('Allocator#make_hashes', call_tree.parent.target.full_name)
+      assert_equal(840.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(840.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callers[3]
+      assert_equal('Allocator#make_strings', call_tree.parent.target.full_name)
+      assert_equal(80.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(40.0, call_tree.children_time)
+
+      assert_equal(4, method.call_trees.callees.length)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('BasicObject#initialize', call_tree.target.full_name)
+      assert_equal(0.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callees[1]
+      assert_equal('Array#initialize', call_tree.target.full_name)
+      assert_equal(0.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callees[2]
+      assert_equal('Hash#initialize', call_tree.target.full_name)
+      assert_equal(0.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callees[3]
+      assert_equal('String#initialize', call_tree.target.full_name)
+      assert_equal(40.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      # Method 4
+      method = methods[4]
+      assert_equal('Allocator#make_hashes', method.full_name)
+      assert_equal(840.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(0.0, method.self_time)
+      assert_equal(840.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Allocator#internal_run', call_tree.parent.target.full_name)
+      assert_equal(840.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(840.0, call_tree.children_time)
+
+      assert_equal(1, method.call_trees.callees.length)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Class#new', call_tree.target.full_name)
+      assert_equal(840.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(840.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      # Method 5
+      method = methods[5]
+      assert_equal('Allocator#make_arrays', method.full_name)
+      assert_equal(400.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(0.0, method.self_time)
+      assert_equal(400.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Allocator#internal_run', call_tree.parent.target.full_name)
+      assert_equal(400.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(400.0, call_tree.children_time)
+
+      assert_equal(1, method.call_trees.callees.length)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Integer#times', call_tree.target.full_name)
+      assert_equal(400.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(400.0, call_tree.children_time)
+
+      # Method 6
+      method = methods[6]
+      assert_equal('Integer#times', method.full_name)
+      assert_equal(400.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(0.0, method.self_time)
+      assert_equal(400.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Allocator#make_arrays', call_tree.parent.target.full_name)
+      assert_equal(400.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(400.0, call_tree.children_time)
+
+      assert_equal(1, method.call_trees.callees.length)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('Class#new', call_tree.target.full_name)
+      assert_equal(400.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(400.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      # Method 7
+      method = methods[7]
+      assert_equal('Allocator#make_strings', method.full_name)
+      assert_equal(160.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(40.0, method.self_time)
+      assert_equal(120.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Allocator#internal_run', call_tree.parent.target.full_name)
+      assert_equal(160.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(120.0, call_tree.children_time)
+
+      assert_equal(2, method.call_trees.callees.length)
+      call_tree = method.call_trees.callees[0]
+      assert_equal('String#*', call_tree.target.full_name)
+      assert_equal(40.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      call_tree = method.call_trees.callees[1]
+      assert_equal('Class#new', call_tree.target.full_name)
+      assert_equal(80.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(40.0, call_tree.children_time)
+
+      # Method 8
+      method = methods[8]
+      assert_equal('String#*', method.full_name)
+      assert_equal(40.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(40.0, method.self_time)
+      assert_equal(0.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Allocator#make_strings', call_tree.parent.target.full_name)
+      assert_equal(40.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      assert_equal(0.0, method.call_trees.callees.length)
+
+      # Method 9
+      method = methods[9]
+      assert_equal('String#initialize', method.full_name)
+      assert_equal(40.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(40.0, method.self_time)
+      assert_equal(0.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Class#new', call_tree.parent.target.full_name)
+      assert_equal(40.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(40.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      assert_equal(0.0, method.call_trees.callees.length)
+
+      # Method 10
+      method = methods[10]
+      assert_equal('BasicObject#initialize', method.full_name)
+      assert_equal(0.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(0.0, method.self_time)
+      assert_equal(0.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Class#new', call_tree.parent.target.full_name)
+      assert_equal(0.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      assert_equal(0.0, method.call_trees.callees.length)
+
+      # Method 11
+      method = methods[11]
+      assert_equal('Hash#initialize', method.full_name)
+      assert_equal(0.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(0.0, method.self_time)
+      assert_equal(0.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Class#new', call_tree.parent.target.full_name)
+      assert_equal(0.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
+      assert_equal(0.0, method.call_trees.callees.length)
+
+      # Method 12
+      method = methods[12]
+      assert_equal('Array#initialize', method.full_name)
+      assert_equal(0.0, method.total_time)
+      assert_equal(0.0, method.wait_time)
+      assert_equal(0.0, method.self_time)
+      assert_equal(0.0, method.children_time)
+
+      assert_equal(1, method.call_trees.callers.length)
+      call_tree = method.call_trees.callers[0]
+      assert_equal('Class#new', call_tree.parent.target.full_name)
+      assert_equal(0.0, call_tree.total_time)
+      assert_equal(0.0, call_tree.wait_time)
+      assert_equal(0.0, call_tree.self_time)
+      assert_equal(0.0, call_tree.children_time)
+
       assert_equal(0.0, method.call_trees.callees.length)
     end
   end

data/test/printer_flat_test.rb

@@ -37,7 +37,7 @@ class PrinterFlatTest < TestCase
     array = array.map(&:to_f) # allow for > 10s times to sort right, since lexographically 4.0 > 10.0
     assert_equal(array, array.sort.reverse)
   end
-  
+
   def test_flat_string
     output = helper_test_flat_string(RubyProf::FlatPrinter)
     assert_match(/prime.rb/, output)

data/test/printers_test.rb

@@ -37,10 +37,10 @@ class PrintersTest < TestCase
   end
 
   def test_print_to_files
-    output_dir = 'examples2'
+    output_dir = 'tmp/examples2'
 
     if ENV['SAVE_NEW_PRINTER_EXAMPLES']
-      output_dir = 'examples'
+      output_dir = 'tmp/examples'
     end
     FileUtils.mkdir_p output_dir
 

data/test/start_stop_test.rb

@@ -22,23 +22,23 @@ class StartStopTest < TestCase
     sleep(2)
     @result = RubyProf.stop
   end
-  
+
   def test_extra_stop_should_raise
     RubyProf.start
     assert_raises(RuntimeError) do
       RubyProf.start
     end
-    
+
     assert_raises(RuntimeError) do
       RubyProf.profile {}
     end
-    
+
     RubyProf.stop # ok
     assert_raises(RuntimeError) do
       RubyProf.stop
     end
   end
-    
+
   def test_different_methods
     method1
 

data/test/temp.rb

@@ -0,0 +1,20 @@
+require 'redis'
+
+path = File.expand_path(File.join(__dir__, '..', 'lib'))
+$LOAD_PATH << path
+require 'ruby-prof'
+
+Widget = Struct.new(:key) do
+  def set!
+    Redis.current.set(key, 1, ex: 10)
+  end
+end
+
+result = RubyProf.profile do
+  (1..20).each { |i| Widget.new(i).set! }
+end
+
+printer = RubyProf::CallStackPrinter.new(result)
+File.open("framez.html", 'w:ASCII-8BIT') do |file|
+  printer.print(file, {})
+end

data/test/test_helper.rb

@@ -1,13 +1,17 @@
 # encoding: UTF-8
 
+require 'bundler/setup'
+require 'minitest/autorun'
+
 # Disable minitest parallel tests. The problem is the thread switching will change test results
 # (self vs wait time)
-ENV["N"] = "0" # Older versions of minitest
-ENV["MT_CPU"] = "0" # Newer versions minitest
+if Gem::Version.new(Minitest::VERSION) > Gem::Version.new('5.11.3')
+  ENV["MT_CPU"] = "0" # Newer versions minitest
+else
+  ENV["N"] = "0" # Older versions of minitest
+end
 
-require 'bundler/setup'
-require 'minitest/autorun'
 require 'ruby-prof'
 
 class TestCase < Minitest::Test
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: x64-mingw32
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2021-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -100,6 +100,7 @@ files:
 - ext/ruby_prof/vc/ruby_prof.sln
 - ext/ruby_prof/vc/ruby_prof.vcxproj
 - lib/2.7/ruby_prof.so
+- lib/3.0/ruby_prof.so
 - lib/ruby-prof.rb
 - lib/ruby-prof/assets/call_stack_printer.html.erb
 - lib/ruby-prof/assets/call_stack_printer.png
@@ -167,6 +168,7 @@ files:
 - test/singleton_test.rb
 - test/stack_printer_test.rb
 - test/start_stop_test.rb
+- test/temp.rb
 - test/test_helper.rb
 - test/thread_test.rb
 - test/unique_call_path_test.rb
@@ -178,7 +180,7 @@ metadata:
   bug_tracker_uri: https://github.com/ruby-prof/ruby-prof/issues
   changelog_uri: https://github.com/ruby-prof/ruby-prof/blob/master/CHANGES
   documentation_uri: https://ruby-prof.github.io/
-  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.4.2
+  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.4.3
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -187,7 +189,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="