Skip to content

Commit

Permalink
Showing 5 changed files with 1 addition and 108 deletions.
3 changes: 1 addition & 2 deletions core/src/main/java/org/jruby/util/cli/Options.java
Original file line number Diff line number Diff line change
@@ -292,10 +292,9 @@ public class Options {
public static final Option<Boolean> TRUFFLE_BACKTRACES_INTERLEAVE_JAVA = bool(TRUFFLE, "truffle.backtraces.interleave_java", false, "Interleave Java stacktraces into the Ruby backtrace.");
public static final Option<Integer> TRUFFLE_BACKTRACES_LIMIT = integer(TRUFFLE, "truffle.backtraces.limit", 9999, "Limit the size of Ruby backtraces.");
public static final Option<Boolean> TRUFFLE_BACKTRACES_OMIT_UNUSED = bool(TRUFFLE, "truffle.backtraces.omit_unused", true, "Omit backtraces that should be unused as they have pure rescue expressions.");

public static final Option<Boolean> TRUFFLE_METRICS_TIME = bool(TRUFFLE, "truffle.metrics.time", false, "Print the time at various stages of VM operation.");
public static final Option<Boolean> TRUFFLE_METRICS_MEMORY_USED_ON_EXIT = bool(TRUFFLE, "truffle.metrics.memory_used_on_exit", false, "Print the size of heap memory in use on exit.");
public static final Option<Boolean> TRUFFLE_CALL_FREQUENCY = bool(TRUFFLE, "truffle.call_frequency", false, "Print call frequencies every second.");

public static final Option<Boolean> TRUFFLE_CALL_GRAPH = bool(TRUFFLE, "truffle.callgraph", false, "Maintain a call graph.");
public static final Option<String> TRUFFLE_CALL_GRAPH_WRITE = string(TRUFFLE, "truffle.callgraph.write", "File to write the call garph to on exit.");

14 changes: 0 additions & 14 deletions truffle/src/main/java/org/jruby/truffle/RubyContext.java
Original file line number Diff line number Diff line change
@@ -47,7 +47,6 @@
import org.jruby.truffle.platform.NativePlatform;
import org.jruby.truffle.platform.NativePlatformFactory;
import org.jruby.truffle.stdlib.CoverageManager;
import org.jruby.truffle.tools.CallFrequency;
import org.jruby.truffle.tools.InstrumentationServerManager;
import org.jruby.truffle.tools.callgraph.CallGraph;
import org.jruby.truffle.tools.callgraph.SimpleWriter;
@@ -92,7 +91,6 @@ public class RubyContext extends ExecutionContext {
private final CallGraph callGraph;
private final PrintStream debugStandardOut;
private final CoverageManager coverageManager;
private final CallFrequency callFrequency;

private final Object classVariableDefinitionLock = new Object();

@@ -154,15 +152,6 @@ public RubyContext(Ruby jrubyRuntime, TruffleLanguage.Env env) {
primitiveManager.addAnnotatedPrimitives();
org.jruby.Main.printTruffleTimeMetric("after-load-nodes");

// Systems which need to be loaded before we load Ruby core

if (options.CALL_FREQUENCY) {
callFrequency = new CallFrequency(this);
callFrequency.start();
} else {
callFrequency = null;
}

// Load the reset of the core library

coreLibrary.initializeAfterBasicMethodsAdded();
@@ -359,7 +348,4 @@ public CoreExceptions getCoreExceptions() {
return coreExceptions;
}

public CallFrequency getCallFrequency() {
return callFrequency;
}
}
2 changes: 0 additions & 2 deletions truffle/src/main/java/org/jruby/truffle/language/Options.java
Original file line number Diff line number Diff line change
@@ -18,7 +18,6 @@
import static org.jruby.util.cli.Options.TRUFFLE_BACKTRACES_OMIT_UNUSED;
import static org.jruby.util.cli.Options.TRUFFLE_BINDING_LOCAL_VARIABLE_CACHE;
import static org.jruby.util.cli.Options.TRUFFLE_BIND_CACHE;
import static org.jruby.util.cli.Options.TRUFFLE_CALL_FREQUENCY;
import static org.jruby.util.cli.Options.TRUFFLE_CALL_GRAPH;
import static org.jruby.util.cli.Options.TRUFFLE_CALL_GRAPH_WRITE;
import static org.jruby.util.cli.Options.TRUFFLE_CLASS_CACHE;
@@ -152,7 +151,6 @@ public class Options {
public final boolean BACKTRACES_INTERLEAVE_JAVA = TRUFFLE_BACKTRACES_INTERLEAVE_JAVA.load();
public final int BACKTRACES_LIMIT = TRUFFLE_BACKTRACES_LIMIT.load();
public final boolean BACKTRACES_OMIT_UNUSED = TRUFFLE_BACKTRACES_OMIT_UNUSED.load();
public final boolean CALL_FREQUENCY = TRUFFLE_CALL_FREQUENCY.load();

// Call graph

Original file line number Diff line number Diff line change
@@ -41,10 +41,6 @@ public Object dispatch(
Object methodName,
DynamicObject blockObject,
Object[] argumentsObjects) {
if (context.getOptions().CALL_FREQUENCY) {
context.getCallFrequency().called(receiverObject, methodName);
}

return first.executeDispatch(
frame,
receiverObject,
86 changes: 0 additions & 86 deletions truffle/src/main/java/org/jruby/truffle/tools/CallFrequency.java

This file was deleted.

0 comments on commit 544ac79

Please sign in to comment.