jruby · Feb 8, 2016 · Feb 8, 2016 · Feb 8, 2016 · Feb 8, 2016 · Feb 8, 2016
Showing with 54 additions and 13 deletions.

+53 −12 tool/jt.rb

+1 −1 truffle/src/main/java/org/jruby/truffle/language/Options.java
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -20,6 +20,7 @@
 JDEBUG = "-J-agentlib:jdwp=transport=dt_socket,server=y,address=#{JDEBUG_PORT},suspend=y"
 JDEBUG_TEST = "-Dmaven.surefire.debug=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=#{JDEBUG_PORT} -Xnoagent -Djava.compiler=NONE"
 JEXCEPTION = "-Xtruffle.exceptions.print_java=true"
+METRICS_REPS = 10
 
 # wait for sub-processes to handle the interrupt
 trap(:INT) {}
@@ -142,7 +143,11 @@ module ShellUtils
   private
 
   def raw_sh(*args)
-    puts "$ #{printable_cmd(args)}"
+    if args.last == :no_print_cmd
+      args.pop
+    else
+      puts "$ #{printable_cmd(args)}"
+    end
     result = system(*args)
     unless result
       $stderr.puts "FAILED (#{$?}): #{printable_cmd(args)}"
@@ -245,8 +250,7 @@ def help
     puts 'jt bench compare [benchmarks]                  run a set of benchmarks and compare against a reference point'
     puts '    benchmarks can be any benchmarks or group of benchmarks supported'
     puts '    by bench9000, eg all, classic, chunky, 3, 5, 10, 15 - default is 5'
-    puts 'jt findbugs                                    run findbugs'
-    puts 'jt findbugs report                             run findbugs and generate an HTML report'
+    puts 'jt metrics alloc ...                           how much memory is allocated running a program (use -X-T to test normal JRuby)'
     puts 'jt install ..../graal/mx/suite.py              install a JRuby distribution into an mx suite'
     puts
     puts 'you can also put build or rebuild in front of any command'
@@ -540,16 +544,53 @@ def bench(command, *args)
     end
     raw_sh env_vars, "ruby", *bench_args, *args
   end
-
-  def findbugs(report=nil)
-    case report
-    when 'report'
-      sh 'tool/truffle-findbugs.sh', '--report'
-      sh 'open', 'truffle-findbugs-report.html'
-    when nil
-      sh 'tool/truffle-findbugs.sh'
+
+  def metrics(command, *args)
+    case command
+    when 'alloc'
+      metrics_alloc *args
+    else
+      raise ArgumentError, command
+    end
+  end
+
+  def metrics_alloc(*args)
+    samples = []
+    METRICS_REPS.times do
+      print '.' if STDOUT.tty?
+      r, w = IO.pipe
+      run '-Xtruffle.metrics.memory_used_on_exit=true', '-J-verbose:gc', *args, {err: w, out: w}, :no_print_cmd
+      w.close
+      samples.push memory_allocated(r.read)
+      r.close
+    end
+    puts if STDOUT.tty?
+    puts "#{human_size(samples.inject(:+)/samples.size)}, range #{human_size(samples.max-samples.min)}"
+  end
+
+  def memory_allocated(trace)
+    allocated = 0
+    trace.lines do |line|
+      case line
+      when /(\d+)K->(\d+)K/
+        before = $1.to_i * 1024
+        after = $2.to_i * 1024
+        collected = before - after
+        allocated += collected
+      when /^allocated (\d+)$/
+        allocated += $1.to_i
+      end
+    end
+    allocated
+  end
+
+  def human_size(bytes)
+    if bytes < 1024
+      "#{bytes} B"
+    elsif bytes < 1024**2
+      "#{(bytes/1024.0).round(2)} KB"
     else
-      raise ArgumentError, report
+      "#{(bytes/1024.0**2).round(2)} MB"
     end
   end
 

diff --git a/truffle/src/main/java/org/jruby/truffle/language/Options.java b/truffle/src/main/java/org/jruby/truffle/language/Options.java
@@ -70,7 +70,7 @@ public class Options {
     public final boolean BACKTRACES_OMIT_UNUSED = org.jruby.util.cli.Options.TRUFFLE_BACKTRACES_OMIT_UNUSED.load();
     public final boolean INCLUDE_CORE_FILE_CALLERS_IN_SET_TRACE_FUNC = org.jruby.util.cli.Options.TRUFFLE_INCLUDE_CORE_FILE_CALLERS_IN_SET_TRACE_FUNC.load();
 
-    // Call garph
+    // Call graph
 
     public final boolean CALL_GRAPH = org.jruby.util.cli.Options.TRUFFLE_CALL_GRAPH.load();
     public final String CALL_GRAPH_WRITE = org.jruby.util.cli.Options.TRUFFLE_CALL_GRAPH_WRITE.load();