[GR-32856] Fix --cpusampler test and use the ruby that runs jt to run rubocop

PullRequest: truffleruby/2840

Author: eregon

doc/contributor/profiling.md

@@ -48,12 +48,9 @@ Creating the flame graph is a multi-stage process. First, we need to profile the
 with the JSON formatter:
 
 ```bash
-jt ruby --cpusampler --cpusampler.Mode=roots --cpusampler.Output=json -e 'p :hello' > simple-app.json
+jt ruby --cpusampler --cpusampler.Output=json -e 'p :hello' > simple-app.json
 ```
 
-The `--cpusampler.Mode=roots` option will sample roots, including inlined functions,
-which can often give a better idea of what is contributing to the overall method execution time.
-
 The JSON profiler formatter encodes call graph information that isn't available in the
 histogram format. To make a flame graph out of this output, however, we need to transform
 it into a format that folds the call stack samples into single lines. This can be done

spec/truffle/gc/time_spec.rb

@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2015, 2019 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
@@ -16,11 +18,7 @@
 
   it "increases as collections are run" do
     time_before = GC.time
-    i = 0
-    while GC.time <= time_before and i < 10
-      GC.start
-      i += 1
-    end
+    Primitive.gc_force
     GC.time.should > time_before
   end
 

spec/truffle/objspace/undefine_finalizer_spec.rb

@@ -1,3 +1,5 @@
+# truffleruby_primitives: true
+
 # Copyright (c) 2017, 2019 Oracle and/or its affiliates. All rights reserved. This
 # code is released under a tri EPL/GPL/LGPL license. You can use it,
 # redistribute it and/or modify it under the terms of the:
@@ -25,7 +27,7 @@
       ObjectSpace.undefine_finalizer object
       ObjectSpace.reachable_objects_from(object).should_not include(finalizer)
     end
-    GC.start
+    Primitive.gc_force
     Truffle::Debug.drain_finalization_queue               # Not needed for correctness
     channel.try_receive.should be_nil
   end

spec/truffle/tools_spec.rb

@@ -59,7 +59,7 @@
       code = <<~RUBY
       def foo
         n = 0
-        loop { itself { n += 1 } }
+        loop { yield_self { n += 1 } }
         n
       end
       t = Thread.new { foo }
@@ -68,9 +68,9 @@ def foo
       t.kill
       t.join
       RUBY
-      out = ruby_exe(code, options: "--cpusampler --cpusampler.Mode=roots")
+      out = ruby_exe(code, options: "--cpusampler")
       out.should.include?(":kill")
-      out.should.include?("block in Object#foo")
+      out.should.include?("block (2 levels) in Object#foo")
       out.should_not.include?('KillException')
       $?.should.success?
     end

tool/jt.rb

@@ -39,7 +39,7 @@
 
 JDEBUG = '--vm.agentlib:jdwp=transport=dt_socket,server=y,address=8000,suspend=y'
 METRICS_REPS = Integer(ENV['TRUFFLERUBY_METRICS_REPS'] || 10)
-DEFAULT_PROFILE_OPTIONS = %w[--cpusampler --cpusampler.Mode=roots --cpusampler.Output=json]
+DEFAULT_PROFILE_OPTIONS = %w[--cpusampler --cpusampler.Output=json]
 
 RUBOCOP_INCLUDE_LIST = %w[
   lib/cext
@@ -2304,15 +2304,18 @@ def rubocop(*args)
       args += RUBOCOP_INCLUDE_LIST
     end
 
+    ruby = RbConfig.ruby
+
     if gem_test_pack?
       gem_home = "#{gem_test_pack}/rubocop-gems"
       env = { 'GEM_HOME' => gem_home, 'GEM_PATH' => gem_home }
-      sh env, 'ruby', "#{gem_home}/bin/rubocop", *args
+      sh env, ruby, "#{gem_home}/bin/rubocop", *args
     else
-      unless sh('rubocop', "_#{RUBOCOP_VERSION}_", *args, continue_on_failure: true)
-        sh 'gem', 'install', 'rubocop', '-v', RUBOCOP_VERSION
-        sh 'rubocop', "_#{RUBOCOP_VERSION}_", *args
+      env = { 'PATH' => "#{File.dirname(ruby)}:#{ENV['PATH']}" }
+      if Gem::Specification.find_all_by_name('rubocop', "#{RUBOCOP_VERSION}").empty?
+        sh env, 'gem', 'install', 'rubocop', '-v', RUBOCOP_VERSION
       end
+      sh env, 'rubocop', "_#{RUBOCOP_VERSION}_", *args
     end
   end