[Truffle] Old profile doesn't work like this any more.

jruby · Jul 5, 2016 · 0e73cfc · 0e73cfc
1 parent 1c89dd0
commit 0e73cfc
Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -236,7 +236,6 @@ public class Options {
     public static final Option<Boolean> TRUFFLE_PLATFORM_USE_JAVA = bool(TRUFFLE, "truffle.platform.use_java", false, "Use a pure-Java platform, so no native POSIX.");
 
     public static final Option<Boolean> TRUFFLE_COVERAGE_GLOBAL = bool(TRUFFLE, "truffle.coverage.global", false, "Run coverage for all code and print results on exit.");
-    public static final Option<Boolean> TRUFFLE_PROFILER = bool(TRUFFLE, "truffle.profiler", false, "Run the Truffle profiler.");
 
     public static final Option<String> TRUFFLE_CORE_LOAD_PATH = string(TRUFFLE, "truffle.core.load_path", "truffle:/jruby-truffle", "Location to load the Truffle core library from.");
     public static final Option<Boolean> TRUFFLE_CORE_PARALLEL_LOAD = bool(TRUFFLE, "truffle.core.parallel_load", true, "Load the Truffle core library in parallel.");

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -508,7 +508,6 @@ def run(*args)
       v = Utilities.truffle_version
       jruby_args << "-J-Xbootclasspath/a:#{M2_REPO}/com/oracle/truffle/truffle-debug/#{v}/truffle-debug-#{v}.jar"
       jruby_args << "-J-Dtruffle.profiling.enabled=true"
-      jruby_args << "-Xtruffle.profiler=true"
     end
 
     if args.delete('--igv')

diff --git a/truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java b/truffle/src/main/java/org/jruby/truffle/JRubyTruffleImpl.java
@@ -11,8 +11,8 @@
 
 import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.api.vm.PolyglotEngine;
-//import com.oracle.truffle.tools.TruffleProfiler;
 import java.io.IOException;
+
 import org.jruby.JRubyTruffleInterface;
 import org.jruby.Ruby;
 import org.jruby.truffle.interop.JRubyContextWrapper;
@@ -32,12 +32,6 @@ public JRubyTruffleImpl(Ruby runtime) {
         engine = PolyglotEngine.newBuilder()
                 .globalSymbol(JRubyTruffleInterface.RUNTIME_SYMBOL, new JRubyContextWrapper(runtime))
                 .build();
-
-        if (Options.TRUFFLE_PROFILER.load()) {
-            throw new UnsupportedOperationException("the profiler is temporarily not implemented");
-            //engine.getInstruments().get(TruffleProfiler.ID).setEnabled(true);
-        }
-
         try {
             context = (RubyContext) engine.eval(loadSource("Truffle::Boot.context", "context")).get();
         } catch (IOException e) {