[Truffle] Initial work on new instrumentation API.

jruby · Dec 5, 2015 · 73c9609 · 73c9609
1 parent 581abfc
commit 73c9609
Showing 10 changed files with 14 additions and 207 deletions.
diff --git a/truffle/pom.rb b/truffle/pom.rb
@@ -16,7 +16,7 @@
   repository( :url => 'http://lafo.ssw.uni-linz.ac.at/nexus/content/repositories/snapshots/',
               :id => 'truffle' )
 
-  truffle_version = 'a6a1efa177d2aba0b726e024755ec571b601b4d2-SNAPSHOT'
+  truffle_version = '0.10-SNAPSHOT'
   jar 'com.oracle.truffle:truffle-api:' + truffle_version
   jar 'com.oracle.truffle:truffle-debug:' + truffle_version
   jar 'com.oracle.truffle:truffle-dsl-processor:' + truffle_version, :scope => 'provided'

diff --git a/truffle/pom.xml b/truffle/pom.xml
@@ -36,23 +36,23 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-api</artifactId>
-      <version>a6a1efa177d2aba0b726e024755ec571b601b4d2-SNAPSHOT</version>
+      <version>0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-debug</artifactId>
-      <version>a6a1efa177d2aba0b726e024755ec571b601b4d2-SNAPSHOT</version>
+      <version>0.10-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-dsl-processor</artifactId>
-      <version>a6a1efa177d2aba0b726e024755ec571b601b4d2-SNAPSHOT</version>
+      <version>0.10-SNAPSHOT</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.oracle.truffle</groupId>
       <artifactId>truffle-tck</artifactId>
-      <version>a6a1efa177d2aba0b726e024755ec571b601b4d2-SNAPSHOT</version>
+      <version>0.10-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <dependency>

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyNode.java
@@ -9,44 +9,30 @@
  */
 package org.jruby.truffle.nodes;
 
-import com.oracle.truffle.api.CompilerAsserts;
-import com.oracle.truffle.api.CompilerDirectives;
-import com.oracle.truffle.api.Truffle;
 import com.oracle.truffle.api.dsl.ImportStatic;
 import com.oracle.truffle.api.dsl.TypeSystemReference;
-import com.oracle.truffle.api.frame.*;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.UnexpectedResultException;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.object.DynamicObjectFactory;
 import com.oracle.truffle.api.source.SourceSection;
+import com.oracle.truffle.api.instrumentation.*;
 import jnr.ffi.provider.MemoryManager;
 import jnr.posix.POSIX;
 
 import org.jcodings.specific.UTF8Encoding;
-import org.jruby.truffle.nodes.instrument.RubyWrapperNode;
 import org.jruby.truffle.runtime.NotProvided;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.core.StringOperations;
 import org.jruby.truffle.runtime.layouts.Layouts;
 import org.jruby.truffle.runtime.sockets.NativeSockets;
-import org.jruby.truffle.translator.TranslatorDriver;
 import org.jruby.util.ByteList;
-import org.jruby.util.StringSupport;
 
-import com.oracle.truffle.api.dsl.ImportStatic;
-import com.oracle.truffle.api.dsl.TypeSystemReference;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.nodes.Node;
-import com.oracle.truffle.api.nodes.UnexpectedResultException;
-import com.oracle.truffle.api.object.DynamicObject;
-import com.oracle.truffle.api.object.DynamicObjectFactory;
-import com.oracle.truffle.api.source.SourceSection;
-import org.jcodings.specific.USASCIIEncoding;
 
 @TypeSystemReference(RubyTypes.class)
 @ImportStatic(RubyGuards.class)
-public abstract class RubyNode extends Node {
+public abstract class RubyNode extends Node implements InstrumentableNode {
 
     private final RubyContext context;
 
@@ -205,10 +191,6 @@ public boolean isAtNewline() {
         return atNewline;
     }
 
-    public RubyNode getNonProxyNode() {
-        return this;
-    }
-
     // Accessors
 
     public RubyContext getContext() {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/RubyRootNode.java
@@ -13,7 +13,6 @@
 import com.oracle.truffle.api.ExecutionContext;
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrument.Probe;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.source.SourceSection;
 import org.jruby.truffle.runtime.RubyContext;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/TrufflePrimitiveNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/TrufflePrimitiveNodes.java
@@ -19,7 +19,7 @@
 import com.oracle.truffle.api.frame.FrameInstanceVisitor;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrument.Instrument;
+import com.oracle.truffle.api.instrumentation.Instrument;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.object.DynamicObject;
 import com.oracle.truffle.api.source.Source;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/instrument/RubyDefaultASTProber.java b/truffle/src/main/java/org/jruby/truffle/nodes/instrument/RubyDefaultASTProber.java
@@ -9,10 +9,10 @@
  */
 package org.jruby.truffle.nodes.instrument;
 
-import com.oracle.truffle.api.instrument.ASTProber;
-import com.oracle.truffle.api.instrument.Instrumenter;
-import com.oracle.truffle.api.instrument.Probe;
-import com.oracle.truffle.api.instrument.StandardSyntaxTag;
+import com.oracle.truffle.api.instrumentation.ASTProber;
+import com.oracle.truffle.api.instrumentation.Instrumenter;
+import com.oracle.truffle.api.instrumentation.Probe;
+import com.oracle.truffle.api.instrumentation.StandardSyntaxTag;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.NodeVisitor;
 import com.oracle.truffle.api.nodes.RootNode;

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/instrument/RubyWrapperNode.java b/truffle/src/main/java/org/jruby/truffle/nodes/instrument/RubyWrapperNode.java
diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/RubySyntaxTag.java b/truffle/src/main/java/org/jruby/truffle/runtime/RubySyntaxTag.java
@@ -9,7 +9,7 @@
  */
 package org.jruby.truffle.runtime;
 
-import com.oracle.truffle.api.instrument.SyntaxTag;
+import com.oracle.truffle.api.instrumentation.SyntaxTag;
 
 /**
  * Syntax tags for Ruby-language statements. The set of tags are derived from the events provided for the

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/AttachmentsManager.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/AttachmentsManager.java
@@ -16,7 +16,6 @@
 import com.oracle.truffle.api.frame.FrameDescriptor;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrument.*;
 import com.oracle.truffle.api.nodes.DirectCallNode;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
@@ -29,15 +28,11 @@
 import org.jruby.truffle.nodes.RubyGuards;
 import org.jruby.truffle.nodes.core.BindingNodes;
 import org.jruby.truffle.nodes.core.ProcNodes;
-import org.jruby.truffle.nodes.methods.DeclarationContext;
-import org.jruby.truffle.runtime.RubyArguments;
 import org.jruby.truffle.runtime.RubyContext;
 import org.jruby.truffle.runtime.RubyLanguage;
 import org.jruby.truffle.runtime.layouts.Layouts;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class AttachmentsManager {

diff --git a/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/TraceManager.java b/truffle/src/main/java/org/jruby/truffle/runtime/subsystems/TraceManager.java
@@ -15,7 +15,7 @@
 import com.oracle.truffle.api.frame.FrameInstance;
 import com.oracle.truffle.api.frame.MaterializedFrame;
 import com.oracle.truffle.api.frame.VirtualFrame;
-import com.oracle.truffle.api.instrument.*;
+import com.oracle.truffle.api.instrumentation.*;
 import com.oracle.truffle.api.nodes.Node;
 import com.oracle.truffle.api.nodes.RootNode;
 import com.oracle.truffle.api.object.DynamicObject;