[GR-16124] Fix minheap metrics.

PullRequest: truffleruby/868

Author: eregon

tool/jt.rb

@@ -98,12 +98,7 @@
 [:SIGINT, :SIGTERM].each do |signal|
   trap(signal) do
     SUBPROCESSES.each do |pid|
-      puts "\nSending #{signal} to process #{pid}"
-      begin
-        Process.kill(signal, pid)
-      rescue Errno::ESRCH
-        # Already killed
-      end
+      Utilities.send_signal(signal, pid)
     end
     # Keep running jt which will wait for the subprocesses termination
   end
@@ -137,6 +132,17 @@ def jvmci_update_and_version
     [update, jvmci]
   end
 
+  def send_signal(signal, pid)
+    STDERR.puts "\nSending #{signal} to process #{pid}"
+    begin
+      Process.kill(signal, pid)
+    rescue Errno::ESRCH
+      # Already killed
+      nil
+    end
+  end
+  module_function :send_signal
+
   def which(binary)
     ENV["PATH"].split(File::PATH_SEPARATOR).each do |dir|
       path = "#{dir}/#{binary}"
@@ -259,7 +265,10 @@ def raw_sh_with_timeout(timeout, pid)
           yield
         end
       rescue Timeout::Error
-        Process.kill('TERM', pid)
+        if send_signal(:SIGTERM, pid)
+          sleep 1
+          send_signal(:SIGKILL, pid)
+        end
         yield # Wait and read the pipe if capture: true
         :timeout
       end
@@ -313,8 +322,6 @@ def raw_sh(*args)
       end
     end
 
-    result = status.success?
-
     if capture
       pipe_r.close
     end