# HG changeset patch # User Christian Humer # Date 1415211265 -3600 # Node ID b0a8fb72c72100adff30910d3814861e585925cd # Parent 1d430dfce76d1fcf48d1283a0d01c2901d9ad547 Truffle: changed argument of GraalTruffleCompilationListener#notifyStartup and #notifyShutdown to GraalTruffleRuntime. diff -r 1d430dfce76d -r b0a8fb72c721 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleCompilationListener.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleCompilationListener.java Wed Nov 05 19:12:51 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleCompilationListener.java Wed Nov 05 19:14:25 2014 +0100 @@ -24,7 +24,6 @@ import com.oracle.graal.api.code.*; import com.oracle.graal.nodes.*; -import com.oracle.truffle.api.*; import com.oracle.truffle.api.nodes.*; /** @@ -88,11 +87,11 @@ /** * Invoked as the compiler gets shut down. */ - void notifyShutdown(TruffleRuntime runtime); + void notifyShutdown(GraalTruffleRuntime runtime); /** * Invoked as soon as the compiler is ready to use. */ - void notifyStartup(TruffleRuntime runtime); + void notifyStartup(GraalTruffleRuntime runtime); } diff -r 1d430dfce76d -r b0a8fb72c721 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java Wed Nov 05 19:12:51 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/GraalTruffleRuntime.java Wed Nov 05 19:14:25 2014 +0100 @@ -284,11 +284,11 @@ compilationListeners.forEach(l -> l.notifyCompilationTruffleTierFinished(target, graph)); } - public void notifyShutdown(TruffleRuntime runtime) { + public void notifyShutdown(GraalTruffleRuntime runtime) { compilationListeners.forEach(l -> l.notifyShutdown(runtime)); } - public void notifyStartup(TruffleRuntime runtime) { + public void notifyStartup(GraalTruffleRuntime runtime) { compilationListeners.forEach(l -> l.notifyStartup(runtime)); } diff -r 1d430dfce76d -r b0a8fb72c721 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java Wed Nov 05 19:12:51 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/AbstractDebugCompilationListener.java Wed Nov 05 19:14:25 2014 +0100 @@ -29,7 +29,6 @@ import com.oracle.graal.debug.*; import com.oracle.graal.nodes.*; import com.oracle.graal.truffle.*; -import com.oracle.truffle.api.*; public abstract class AbstractDebugCompilationListener implements GraalTruffleCompilationListener { @@ -62,10 +61,10 @@ public void notifyCompilationInvalidated(OptimizedCallTarget target, Object source, CharSequence reason) { } - public void notifyShutdown(TruffleRuntime runtime) { + public void notifyShutdown(GraalTruffleRuntime runtime) { } - public void notifyStartup(TruffleRuntime runtime) { + public void notifyStartup(GraalTruffleRuntime runtime) { } public static void log(int indent, String msg, String details, Map properties) { diff -r 1d430dfce76d -r b0a8fb72c721 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/CompilationStatisticsListener.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/CompilationStatisticsListener.java Wed Nov 05 19:12:51 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/CompilationStatisticsListener.java Wed Nov 05 19:14:25 2014 +0100 @@ -34,7 +34,6 @@ import com.oracle.graal.nodes.*; import com.oracle.graal.truffle.*; import com.oracle.graal.truffle.TruffleInlining.CallTreeNodeVisitor; -import com.oracle.truffle.api.*; import com.oracle.truffle.api.nodes.*; import com.oracle.truffle.api.nodes.Node; @@ -197,8 +196,8 @@ } @Override - public void notifyShutdown(TruffleRuntime runtime) { - printStatistics((GraalTruffleRuntime) runtime, OUT); + public void notifyShutdown(GraalTruffleRuntime runtime) { + printStatistics(runtime, OUT); } public void printStatistics(GraalTruffleRuntime runtime, PrintStream out) { diff -r 1d430dfce76d -r b0a8fb72c721 graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/PrintCallTargetProfiling.java --- a/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/PrintCallTargetProfiling.java Wed Nov 05 19:12:51 2014 +0100 +++ b/graal/com.oracle.graal.truffle/src/com/oracle/graal/truffle/debug/PrintCallTargetProfiling.java Wed Nov 05 19:14:25 2014 +0100 @@ -40,7 +40,7 @@ } @Override - public void notifyShutdown(TruffleRuntime runtime) { + public void notifyShutdown(GraalTruffleRuntime runtime) { Map> groupedTargets = Truffle.getRuntime().getCallTargets().stream().map(target -> (OptimizedCallTarget) target).collect( Collectors.groupingBy(target -> { if (target.getSourceCallTarget() != null) {