changeset 21685:fd8a92655fbd

Truffle/Instrumentation: improve Probe trace output for builtins
author Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date Tue, 02 Jun 2015 17:11:48 -0700
parents c072fbce5756
children 5fa7935c5de3
files graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Probe.java
diffstat 1 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Probe.java	Tue Jun 02 16:44:16 2015 -0700
+++ b/graal/com.oracle.truffle.api/src/com/oracle/truffle/api/instrument/Probe.java	Tue Jun 02 17:11:48 2015 -0700
@@ -173,9 +173,17 @@
      */
     public static void applyASTProbers(Node node) {
 
+        String name = "<?>";
         final Source source = findSource(node);
-        final String sourceName = source == null ? "<?>" : source.getShortName();
-        trace("START %s", sourceName);
+        if (source != null) {
+            name = source.getShortName();
+        } else {
+            final SourceSection sourceSection = node.getEncapsulatingSourceSection();
+            if (sourceSection != null) {
+                name = sourceSection.getShortDescription();
+            }
+        }
+        trace("START %s", name);
         for (ProbeListener listener : probeListeners) {
             listener.startASTProbing(source);
         }
@@ -185,7 +193,7 @@
         for (ProbeListener listener : probeListeners) {
             listener.endASTProbing(source);
         }
-        trace("FINISHED %s", sourceName);
+        trace("FINISHED %s", name);
     }
 
     /**