ruby-prof 1.2.0 → 1.3.0

data/ext/ruby_prof/rp_thread.h

@@ -8,7 +8,7 @@
 #include "rp_stack.h"
 
 /* Profiling information for a thread. */
-typedef struct
+typedef struct thread_data_t
 {
     // Runtime
     VALUE object;                     /* Cache to wrapped object */
@@ -27,6 +27,8 @@ st_table* threads_table_create(void);
 thread_data_t* threads_table_lookup(void* profile, VALUE fiber);
 thread_data_t* threads_table_insert(void* profile, VALUE fiber);
 void threads_table_free(st_table* table);
+
+thread_data_t* prof_get_thread(VALUE self);
 VALUE prof_thread_wrap(thread_data_t* thread);
 void prof_thread_mark(void* data);
 

data/lib/ruby-prof/version.rb

@@ -1,3 +1,3 @@
 module RubyProf
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/test/fiber_test.rb

@@ -8,7 +8,7 @@ require 'set'
 
 # --  Tests ----
 class FiberTest < TestCase
-  def fiber_test
+  def enumerator_with_fibers
     @fiber_ids << Fiber.current.object_id
     enum = Enumerator.new do |yielder|
       [1,2].each do |x|
@@ -36,7 +36,7 @@ class FiberTest < TestCase
   end
 
   def test_fibers
-    result  = RubyProf.profile { fiber_test }
+    result  = RubyProf.profile { enumerator_with_fibers }
 
     profiled_fiber_ids = result.threads.map(&:fiber_id)
     assert_equal(2, result.threads.length)
@@ -61,7 +61,7 @@ class FiberTest < TestCase
     assert_in_delta(0.33, method.children_time, 0.05)
 
     method = methods[1]
-    assert_equal('FiberTest#fiber_test', method.full_name)
+    assert_equal('FiberTest#enumerator_with_fibers', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(0.33, method.total_time, 0.05)
     assert_in_delta(0, method.self_time, 0.05)
@@ -85,7 +85,7 @@ class FiberTest < TestCase
     assert_in_delta(0, method.children_time, 0.05)
 
     # Since these methods have such short times their order is a bit indeterminate
-    method = methods.detect {|method| method.full_name == 'Class#new'}
+    method = methods.detect {|a_method| a_method.full_name == 'Class#new'}
     assert_equal('Class#new', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -94,16 +94,16 @@ class FiberTest < TestCase
     assert_in_delta(0, method.children_time, 0.05)
 
     if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0')
-    method = methods.detect {|method| method.full_name == 'Set#<<'}
-    assert_equal('Set#<<', method.full_name)
-    assert_equal(1, method.called)
-    assert_in_delta(0, method.total_time, 0.05)
-    assert_in_delta(0, method.self_time, 0.05)
-    assert_in_delta(0, method.wait_time, 0.05)
-    assert_in_delta(0, method.children_time, 0.05)
+      method = methods.detect {|a_method| a_method.full_name == 'Set#<<'}
+      assert_equal('Set#<<', method.full_name)
+      assert_equal(1, method.called)
+      assert_in_delta(0, method.total_time, 0.05)
+      assert_in_delta(0, method.self_time, 0.05)
+      assert_in_delta(0, method.wait_time, 0.05)
+      assert_in_delta(0, method.children_time, 0.05)
     end
 
-    method = methods.detect {|method| method.full_name == 'Module#==='}
+    method = methods.detect {|a_method| a_method.full_name == 'Module#==='}
     assert_equal('Module#===', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -111,7 +111,7 @@ class FiberTest < TestCase
     assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(0, method.children_time, 0.05)
 
-    method = methods.detect {|method| method.full_name == 'Kernel#object_id'}
+    method = methods.detect {|a_method| a_method.full_name == 'Kernel#object_id'}
     assert_equal('Kernel#object_id', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -119,7 +119,7 @@ class FiberTest < TestCase
     assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(0, method.children_time, 0.05)
 
-    method = methods.detect {|method| method.full_name == '<Class::Fiber>#current'}
+    method = methods.detect {|a_method| a_method.full_name == '<Class::Fiber>#current'}
     assert_equal('<Class::Fiber>#current', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -127,7 +127,7 @@ class FiberTest < TestCase
     assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(0, method.children_time, 0.05)
 
-    method = methods.detect {|method| method.full_name == 'Exception#exception'}
+    method = methods.detect {|a_method| a_method.full_name == 'Exception#exception'}
     assert_equal('Exception#exception', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -135,7 +135,7 @@ class FiberTest < TestCase
     assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(0, method.children_time, 0.05)
 
-    method = methods.detect {|method| method.full_name == 'Exception#backtrace'}
+    method = methods.detect {|a_method| a_method.full_name == 'Exception#backtrace'}
     assert_equal('Exception#backtrace', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -143,7 +143,7 @@ class FiberTest < TestCase
     assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(0, method.children_time, 0.05)
 
-    method = methods.detect {|method| method.full_name == 'Enumerator#initialize'}
+    method = methods.detect {|a_method| a_method.full_name == 'Enumerator#initialize'}
     assert_equal('Enumerator#initialize', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -200,7 +200,7 @@ class FiberTest < TestCase
     assert_in_delta(0, method.children_time, 0.05)
 
     # Since these methods have such short times their order is a bit indeterminate
-    method = methods.detect {|method| method.full_name == 'Exception#initialize'}
+    method = methods.detect {|a_method| a_method.full_name == 'Exception#initialize'}
     assert_equal('Exception#initialize', method.full_name)
     assert_equal(1, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -209,7 +209,7 @@ class FiberTest < TestCase
     assert_in_delta(0, method.children_time, 0.05)
 
     if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.5.0')
-      method = methods.detect {|method| method.full_name == 'Set#<<'}
+      method = methods.detect {|a_method| a_method.full_name == 'Set#<<'}
       assert_equal('Set#<<', method.full_name)
       assert_equal(2, method.called)
       assert_in_delta(0, method.total_time, 0.05)
@@ -218,7 +218,7 @@ class FiberTest < TestCase
       assert_in_delta(0, method.children_time, 0.05)
     end
 
-    method = methods.detect {|method| method.full_name == 'Kernel#object_id'}
+    method = methods.detect {|a_method| a_method.full_name == 'Kernel#object_id'}
     assert_equal('Kernel#object_id', method.full_name)
     assert_equal(2, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -226,7 +226,7 @@ class FiberTest < TestCase
     assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(0, method.children_time, 0.05)
 
-    method = methods.detect {|method| method.full_name == 'Enumerator::Yielder#yield'}
+    method = methods.detect {|a_method| a_method.full_name == 'Enumerator::Yielder#yield'}
     assert_equal('Enumerator::Yielder#yield', method.full_name)
     assert_equal(2, method.called)
     assert_in_delta(0, method.total_time, 0.05)
@@ -234,27 +234,18 @@ class FiberTest < TestCase
     assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(0, method.children_time, 0.05)
 
-    method = methods.detect {|method| method.full_name == '<Class::Fiber>#current'}
+    method = methods.detect {|a_method| a_method.full_name == '<Class::Fiber>#current'}
     assert_equal('<Class::Fiber>#current', method.full_name)
     assert_equal(2, method.called)
     assert_in_delta(0, method.total_time, 0.05)
     assert_in_delta(0, method.self_time, 0.05)
     assert_in_delta(0, method.wait_time, 0.05)
     assert_in_delta(0, method.children_time, 0.05)
-
-    #if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.7.0')
-    #  method = methods.detect {|method| method.full_name == 'Numeric#eql?'}
-    #  assert_equal('Numeric#eql?', method.full_name)
-    #  assert_equal(1, method.called)
-    #  assert_in_delta(0, method.total_time, 0.05)
-    #  assert_in_delta(0, method.self_time, 0.05)
-    #  assert_in_delta(0, method.wait_time, 0.05)
-    #  assert_in_delta(0, method.children_time, 0.05)
-    #end
   end
 
   def test_merged_fibers
-    result  = RubyProf.profile(merge_fibers: true) { fiber_test }
+    result  = RubyProf.profile(merge_fibers: true) { enumerator_with_fibers }
+
     assert_equal(1, result.threads.length)
 
     thread = result.threads.first

data/test/gc_test.rb

@@ -2,6 +2,7 @@
 # encoding: UTF-8
 
 require File.expand_path('../test_helper', __FILE__)
+Minitest::Test.i_suck_and_my_tests_are_order_dependent!
 
 class GcTest < TestCase
   def setup
@@ -29,44 +30,21 @@ class GcTest < TestCase
     end
 
     threads.each do |thread|
-      error = assert_raises(RuntimeError) do
-        thread.id
-      end
-      assert_match(/has already been freed/, error.message)
+      refute_nil(thread.id)
     end
-    assert(true)
   end
 
-  def test_hold_onto_root_call_info
-    call_trees = 5.times.reduce(Array.new) do |array, i|
-      array.concat(run_profile.threads.map(&:call_tree))
-      array
-    end
-
-    call_trees.each do |call_tree|
-      error = assert_raises(RuntimeError) do
-        call_tree.source_file
-      end
-      assert_match(/has already been freed/, error.message)
-    end
-    assert(true)
-  end
 
   def test_hold_onto_method
     methods = 5.times.reduce(Array.new) do |array, i|
       profile = run_profile
-      methods_2 = profile.threads.map(&:methods).flatten
-      array.concat(methods_2)
+      array.concat(profile.threads.map(&:methods).flatten)
       array
     end
 
     methods.each do |method|
-      error = assert_raises(RuntimeError) do
-        method.method_name
-      end
-      assert_match(/has already been freed/, error.message)
+      refute_nil(method.method_name)
     end
-    assert(true)
   end
 
   def test_hold_onto_call_trees
@@ -78,12 +56,8 @@ class GcTest < TestCase
     end
 
     method_call_infos.each do |call_trees|
-      error = assert_raises(RuntimeError) do
-        call_trees.call_trees
-      end
-      assert_match(/has already been freed/, error.message)
+      refute_empty(call_trees.call_trees)
     end
-    assert(true)
   end
 
   def test_hold_onto_measurements
@@ -98,8 +72,19 @@ class GcTest < TestCase
       error = assert_raises(RuntimeError) do
         measurement.total_time
       end
-      assert_match(/has already been freed/, error.message)
+      assert_match(/RubyProf::Measurement instance has already been freed/, error.message)
     end
     assert(true)
   end
+
+  def test_hold_onto_root_call_tree
+    call_trees = 5.times.reduce(Array.new) do |array, i|
+      array.concat(run_profile.threads.map(&:call_tree))
+      array
+    end
+
+    call_trees.each do |call_tree|
+      refute_nil(call_tree.source_file)
+    end
+  end
 end

data/test/inverse_call_tree_test.rb

@@ -31,7 +31,7 @@ class InverseCallTreeTest < TestCase
   def test_inverse
     method_name = "method_#{INVERSE_DEPTH - 1}"
     self.send(method_name.to_sym)
-    result = profile = RubyProf.stop
+    profile = RubyProf.stop
 
     assert_equal(1, profile.threads.count)
 

data/test/line_number_test.rb

@@ -6,14 +6,14 @@ require File.expand_path('../test_helper', __FILE__)
 class LineNumbers
   def method_1
     method_2
-    filler = 1
+    _filler = 1
     method_3
   end
 
   def method_2
-    filler = 1
+    _filler = 1
     2.times do |i|
-      filler = 2
+      _filler = 2
       method_3
     end
   end

data/test/measure_wall_time_test.rb

@@ -396,14 +396,14 @@ class MeasureWallTimeTest < TestCase
     assert_in_delta(0.0, methods[2].children_time, 0.03)
 
     if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.7')
-      method = methods.detect {|method| method.full_name == '<Class::RubyProf::C3>#instance'}
+      method = methods.detect {|a_method| a_method.full_name == '<Class::RubyProf::C3>#instance'}
       assert_equal('<Class::RubyProf::C3>#instance', method.full_name)
       assert_in_delta(0.0, method.total_time, 0.03)
       assert_in_delta(0.0, method.wait_time, 0.03)
       assert_in_delta(0.0, method.self_time, 0.03)
       assert_in_delta(0.0, method.children_time, 0.03)
     else
-      method = methods.detect {|method| method.full_name == 'Singleton::SingletonClassMethods#instance'}
+      method = methods.detect {|a_method| a_method.full_name == 'Singleton::SingletonClassMethods#instance'}
       assert_equal('Singleton::SingletonClassMethods#instance', method.full_name)
       assert_in_delta(0.0, method.total_time, 0.03)
       assert_in_delta(0.0, method.wait_time, 0.03)
@@ -411,21 +411,21 @@ class MeasureWallTimeTest < TestCase
       assert_in_delta(0.0, method.children_time, 0.03)
     end
 
-    method = methods.detect {|method| method.full_name == 'Thread::Mutex#synchronize'}
+    method = methods.detect {|a_method| a_method.full_name == 'Thread::Mutex#synchronize'}
     assert_equal('Thread::Mutex#synchronize', method.full_name)
     assert_in_delta(0.0, method.total_time, 0.03)
     assert_in_delta(0.0, method.wait_time, 0.03)
     assert_in_delta(0.0, method.self_time, 0.03)
     assert_in_delta(0.0, method.children_time, 0.03)
 
-    method = methods.detect {|method| method.full_name == 'Class#new'}
+    method = methods.detect {|a_method| a_method.full_name == 'Class#new'}
     assert_equal('Class#new', method.full_name)
     assert_in_delta(0.0, method.total_time, 0.03)
     assert_in_delta(0.0, method.wait_time, 0.03)
     assert_in_delta(0.0, method.self_time, 0.03)
     assert_in_delta(0.0, method.children_time, 0.03)
 
-    method = methods.detect {|method| method.full_name == 'BasicObject#initialize'}
+    method = methods.detect {|a_method| a_method.full_name == 'BasicObject#initialize'}
     assert_equal('BasicObject#initialize', method.full_name)
     assert_in_delta(0.0, method.total_time, 0.03)
     assert_in_delta(0.0, method.wait_time, 0.03)

data/test/unique_call_path_test.rb

@@ -72,7 +72,7 @@ class UniqueCallPathTest < TestCase
     end
     refute_nil(call_info_a)
 
-    children_of_a = call_info_a.children.inject(Array.new) do |array, c|
+    _children_of_a = call_info_a.children.inject(Array.new) do |array, c|
       if c.parent.eql?(call_info_a)
         array << c
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-prof
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Shugo Maeda, Charlie Savage, Roger Pack, Stefan Kaes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-23 00:00:00.000000000 Z
+date: 2020-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -177,7 +177,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.2.0
+  source_code_uri: https://github.com/ruby-prof/ruby-prof/tree/v1.3.0
 post_install_message: 
 rdoc_options: []
 require_paths: