jruby · Jan 5, 2016 · Jan 5, 2016 · Jan 5, 2016 · Jan 5, 2016 · Jan 5, 2016
diff --git a/core/src/main/java/org/jruby/util/cli/Options.java b/core/src/main/java/org/jruby/util/cli/Options.java
@@ -264,6 +264,8 @@ public class Options {
 
     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_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.");
 
     public static String dump() {
         return "# JRuby configuration options with current values\n" +

diff --git a/spec/ruby/core/module/class_variable_get_spec.rb b/spec/ruby/core/module/class_variable_get_spec.rb
@@ -32,11 +32,11 @@
   end
 
   it "returns class variables defined in the metaclass and accessed by class methods" do
-    ModuleSpecs::CVars.meta.should == :meta
+    ModuleSpecs::CVars.meta.should == :metainfo
   end
 
   it "returns class variables defined in the metaclass and accessed by instance methods" do
-    ModuleSpecs::CVars.new.meta.should == :meta
+    ModuleSpecs::CVars.new.meta.should == :metainfo
   end
 
   it "returns a class variable defined in a metaclass" do

diff --git a/spec/ruby/core/module/fixtures/classes.rb b/spec/ruby/core/module/fixtures/classes.rb
@@ -325,7 +325,7 @@ def cls
         @@cls
       end
       # This actually adds it to the parent lexical scope, class CVars
-      @@meta = :meta
+      @@meta = :metainfo
     end
 
     def self.meta

diff --git a/truffle/src/main/java/org/jruby/truffle/callgraph/CallGraph.java b/truffle/src/main/java/org/jruby/truffle/callgraph/CallGraph.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.callgraph;
+
+import org.jruby.truffle.nodes.RubyRootNode;
+import org.jruby.truffle.runtime.methods.SharedMethodInfo;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+public class CallGraph {
+
+    private final Map<SharedMethodInfo, Method> sharedMethodInfoToMethod = new HashMap<>();
+    private final Map<RubyRootNode, MethodVersion> rootNodeToMethodVersion = new HashMap<>();
+
+    public synchronized void registerRootNode(RubyRootNode rootNode) {
+        rootNodeToMethodVersion(rootNode);
+    }
+
+    public Method sharedMethodInfoToMethod(SharedMethodInfo sharedMethodInfo) {
+        Method method = sharedMethodInfoToMethod.get(sharedMethodInfo);
+
+        if (method == null) {
+            method = new Method(this, sharedMethodInfo);
+            sharedMethodInfoToMethod.put(sharedMethodInfo, method);
+        }
+
+        return method;
+    }
+
+    public MethodVersion rootNodeToMethodVersion(RubyRootNode rootNode) {
+        MethodVersion methodVersion = rootNodeToMethodVersion.get(rootNode);
+
+        if (methodVersion == null) {
+            methodVersion = new MethodVersion(sharedMethodInfoToMethod(rootNode.getSharedMethodInfo()), rootNode);
+            rootNodeToMethodVersion.put(rootNode, methodVersion);
+        }
+
+        return methodVersion;
+    }
+
+    public Collection<Method> getMethods() {
+        return Collections.unmodifiableCollection(sharedMethodInfoToMethod.values());
+    }
+
+    public void resolve() {
+        for (MethodVersion methodVersion : rootNodeToMethodVersion.values()) {
+            methodVersion.resolve();
+        }
+    }
+
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/callgraph/CallSite.java b/truffle/src/main/java/org/jruby/truffle/callgraph/CallSite.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.callgraph;
+
+import com.oracle.truffle.api.source.SourceSection;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CallSite {
+
+    private final Method method;
+    private final SourceSection sourceSection;
+    private final List<CallSiteVersion> versions = new ArrayList<>();
+
+    public CallSite(Method method, SourceSection sourceSection) {
+        this.method = method;
+        this.sourceSection = sourceSection;
+    }
+
+    public Method getMethod() {
+        return method;
+    }
+
+    public SourceSection getSourceSection() {
+        return sourceSection;
+    }
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/callgraph/CallSiteVersion.java b/truffle/src/main/java/org/jruby/truffle/callgraph/CallSiteVersion.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.callgraph;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CallSiteVersion {
+
+    private final CallSite callSite;
+    private final List<Calls> calls = new ArrayList<>();
+
+    public CallSiteVersion(CallSite callSite) {
+        this.callSite = callSite;
+    }
+
+    public CallSite getCallSite() {
+        return callSite;
+    }
+
+    public List<Calls> getCalls() {
+        return calls;
+    }
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/callgraph/Calls.java b/truffle/src/main/java/org/jruby/truffle/callgraph/Calls.java
@@ -0,0 +1,13 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.callgraph;
+
+public interface Calls {
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/callgraph/CallsForeign.java b/truffle/src/main/java/org/jruby/truffle/callgraph/CallsForeign.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.callgraph;
+
+public class CallsForeign implements Calls {
+
+    public static final CallsForeign INSTANCE = new CallsForeign();
+
+    private CallsForeign() {
+    }
+
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/callgraph/CallsMegamorphic.java b/truffle/src/main/java/org/jruby/truffle/callgraph/CallsMegamorphic.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.callgraph;
+
+public class CallsMegamorphic implements Calls {
+
+    public static final CallsMegamorphic INSTANCE = new CallsMegamorphic();
+
+    private CallsMegamorphic() {
+    }
+
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/callgraph/CallsMethod.java b/truffle/src/main/java/org/jruby/truffle/callgraph/CallsMethod.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.callgraph;
+
+public class CallsMethod implements Calls {
+
+    private final MethodVersion methodVersion;
+
+    public CallsMethod(MethodVersion methodVersion) {
+        this.methodVersion = methodVersion;
+    }
+
+    public MethodVersion getMethodVersion() {
+        return methodVersion;
+    }
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/callgraph/Method.java b/truffle/src/main/java/org/jruby/truffle/callgraph/Method.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.callgraph;
+
+import com.oracle.truffle.api.nodes.Node;
+import com.oracle.truffle.api.source.SourceSection;
+import org.jruby.truffle.runtime.methods.SharedMethodInfo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class Method {
+
+    private final CallGraph callGraph;
+    private final SharedMethodInfo sharedInfo;
+    private final List<MethodVersion> versions = new ArrayList<>();
+    private final Map<SourceSection, CallSite> callSites = new HashMap<>();
+
+    public Method(CallGraph callGraph, SharedMethodInfo sharedInfo) {
+        this.callGraph = callGraph;
+        this.sharedInfo = sharedInfo;
+    }
+
+    public List<MethodVersion> getVersions() {
+        return versions;
+    }
+
+    public SharedMethodInfo getSharedInfo() {
+        return sharedInfo;
+    }
+
+    public Map<SourceSection, CallSite> getCallSites() {
+        return callSites;
+    }
+
+    public CallSite getCallSite(Node node) {
+        final SourceSection sourceSection = node.getEncapsulatingSourceSection();
+
+        CallSite callSite = callSites.get(sourceSection);
+
+        if (callSite == null) {
+            callSite = new CallSite(this, sourceSection);
+            callSites.put(sourceSection, callSite);
+        }
+
+        return callSite;
+    }
+
+    public CallGraph getCallGraph() {
+        return callGraph;
+    }
+}
diff --git a/truffle/src/main/java/org/jruby/truffle/callgraph/MethodVersion.java b/truffle/src/main/java/org/jruby/truffle/callgraph/MethodVersion.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved. This
+ * code is released under a tri EPL/GPL/LGPL license. You can use it,
+ * redistribute it and/or modify it under the terms of the:
+ *
+ * Eclipse Public License version 1.0
+ * GNU General Public License version 2
+ * GNU Lesser General Public License version 2.1
+ */
+package org.jruby.truffle.callgraph;
+
+import com.oracle.truffle.api.nodes.*;
+import org.jruby.truffle.nodes.RubyRootNode;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class MethodVersion {
+
+    private final Method method;
+    private final RubyRootNode rootNode;
+    private final Map<CallSite, CallSiteVersion> callSiteVersions = new HashMap<>();
+
+    public MethodVersion(Method method, RubyRootNode rootNode) {
+        this.method = method;
+        this.rootNode = rootNode;
+        method.getVersions().add(this);
+    }
+
+    public Method getMethod() {
+        return method;
+    }
+
+    public Map<CallSite, CallSiteVersion> getCallSiteVersions() {
+        return callSiteVersions;
+    }
+
+    public void resolve() {
+        rootNode.accept(new NodeVisitor() {
+
+            @Override
+            public boolean visit(Node node) {
+                resolve(node);
+                return true;
+            }
+
+        });
+    }
+
+    private void resolve(Node node) {
+        if (node instanceof DirectCallNode || node instanceof IndirectCallNode) {
+            final CallSiteVersion callSiteVersion = getCallSiteVersion(node);
+
+            final Calls calls;
+
+            if (node instanceof DirectCallNode) {
+                final DirectCallNode directNode = (DirectCallNode) node;
+                final RootNode rootNode = directNode.getCurrentRootNode();
+
+                if (rootNode instanceof RubyRootNode) {
+                    final MethodVersion methodVersion = method.getCallGraph().rootNodeToMethodVersion((RubyRootNode) rootNode);
+                    calls = new CallsMethod(methodVersion);
+                } else {
+                    calls = CallsForeign.INSTANCE;
+                }
+            } else {
+                calls = CallsMegamorphic.INSTANCE;
+            }
+
+            callSiteVersion.getCalls().add(calls);
+        }
+    }
+
+    private CallSiteVersion getCallSiteVersion(Node node) {
+        final CallSite callSite = method.getCallSite(node);
+
+        CallSiteVersion callSiteVersion = callSiteVersions.get(callSite);
+
+        if (callSiteVersion == null) {
+            callSiteVersion = new CallSiteVersion(callSite);
+            callSiteVersions.put(callSite, callSiteVersion);
+        }
+
+        return callSiteVersion;
+    }
+
+    public RubyRootNode getRootNode() {
+        return rootNode;
+    }
+}