truffle: truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTest.java annotate

annotate truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTest.java @ 22219:1c0f490984d5

Merge with f47b601edbc626dcfe8b3636933b4834c89f7779

author	Michael Van De Vanter <michael.van.de.vanter@oracle.com>
date	Wed, 16 Sep 2015 15:36:22 -0700
parents	dc83cc1f94f2 3aad794eec0e
children	20380d1d41f2

rev	line source
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	1 /*
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	2 * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	4 *
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	5 * This code is free software; you can redistribute it and/or modify it
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	6 * under the terms of the GNU General Public License version 2 only, as
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	7 * published by the Free Software Foundation.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	8 *
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	9 * This code is distributed in the hope that it will be useful, but WITHOUT
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	12 * version 2 for more details (a copy is included in the LICENSE file that
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	13 * accompanied this code).
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	14 *
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	15 * You should have received a copy of the GNU General Public License version
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	16 * 2 along with this work; if not, write to the Free Software Foundation,
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	18 *
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	20 * or visit www.oracle.com if you need additional information or have any
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	21 * questions.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	22 */
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	23 package com.oracle.truffle.api.test.instrument;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	24
22157 dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	25 import com.oracle.truffle.api.CallTarget;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	26 import com.oracle.truffle.api.Truffle;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	27 import com.oracle.truffle.api.TruffleRuntime;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	28 import com.oracle.truffle.api.frame.VirtualFrame;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	29 import com.oracle.truffle.api.instrument.ASTProber;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	30 import com.oracle.truffle.api.instrument.Instrument;
22219 1c0f490984d5 Merge with f47b601edbc626dcfe8b3636933b4834c89f7779 Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 22157 22214 diff changeset	31 import com.oracle.truffle.api.instrument.Instrumenter;
22157 dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	32 import com.oracle.truffle.api.instrument.Probe;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	33 import com.oracle.truffle.api.instrument.ProbeException;
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	34 import com.oracle.truffle.api.instrument.ProbeFailure.Reason;
22157 dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	35 import com.oracle.truffle.api.instrument.ProbeNode;
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	36 import com.oracle.truffle.api.instrument.ProbeNode.WrapperNode;
22157 dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	37 import com.oracle.truffle.api.instrument.SimpleInstrumentListener;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	38 import com.oracle.truffle.api.instrument.StandardInstrumentListener;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	39 import com.oracle.truffle.api.instrument.SyntaxTag;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	40 import com.oracle.truffle.api.instrument.impl.DefaultProbeListener;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	41 import com.oracle.truffle.api.instrument.impl.DefaultSimpleInstrumentListener;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	42 import com.oracle.truffle.api.instrument.impl.DefaultStandardInstrumentListener;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	43 import com.oracle.truffle.api.nodes.Node;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	44 import com.oracle.truffle.api.nodes.NodeVisitor;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	45 import com.oracle.truffle.api.nodes.RootNode;
20106 2e3cc2a27711 Truffle/Instrumentation: a new flavor of Instrument that lazily provides an AST fragment to be attached/adopted directly into a running AST, and to which execution event notifications will be routed. Important use cases so far include conditional breakpoints (with optimizeable conditions) and Ruby set_trace_func. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19869 diff changeset	46 import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestAdditionNode;
2e3cc2a27711 Truffle/Instrumentation: a new flavor of Instrument that lazily provides an AST fragment to be attached/adopted directly into a running AST, and to which execution event notifications will be routed. Important use cases so far include conditional breakpoints (with optimizeable conditions) and Ruby set_trace_func. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19869 diff changeset	47 import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestLanguageNode;
2e3cc2a27711 Truffle/Instrumentation: a new flavor of Instrument that lazily provides an AST fragment to be attached/adopted directly into a running AST, and to which execution event notifications will be routed. Important use cases so far include conditional breakpoints (with optimizeable conditions) and Ruby set_trace_func. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19869 diff changeset	48 import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestLanguageWrapperNode;
2e3cc2a27711 Truffle/Instrumentation: a new flavor of Instrument that lazily provides an AST fragment to be attached/adopted directly into a running AST, and to which execution event notifications will be routed. Important use cases so far include conditional breakpoints (with optimizeable conditions) and Ruby set_trace_func. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19869 diff changeset	49 import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestRootNode;
2e3cc2a27711 Truffle/Instrumentation: a new flavor of Instrument that lazily provides an AST fragment to be attached/adopted directly into a running AST, and to which execution event notifications will be routed. Important use cases so far include conditional breakpoints (with optimizeable conditions) and Ruby set_trace_func. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19869 diff changeset	50 import com.oracle.truffle.api.test.instrument.InstrumentationTestNodes.TestValueNode;
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	51
22157 dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	52 import java.util.Iterator;
22219 1c0f490984d5 Merge with f47b601edbc626dcfe8b3636933b4834c89f7779 Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 22157 22214 diff changeset	53
22157 dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	54 import static org.junit.Assert.assertEquals;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	55 import static org.junit.Assert.assertFalse;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	56 import static org.junit.Assert.assertTrue;
dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	57 import static org.junit.Assert.fail;
22219 1c0f490984d5 Merge with f47b601edbc626dcfe8b3636933b4834c89f7779 Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 22157 22214 diff changeset	58
22157 dc83cc1f94f2 Using fully qualified imports Jaroslav Tulach <jaroslav.tulach@oracle.com> parents: 21951 diff changeset	59 import org.junit.Test;
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	60
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	61 /**
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	62 * <h3>AST Instrumentation</h3>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	63 *
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	64 * Instrumentation allows the insertion into Truffle ASTs language-specific instances of
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	65 * {@link WrapperNode} that propagate execution events through a {@link Probe} to any instances of
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	66 * {@link Instrument} that might be attached to the particular probe by tools.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	67 * <ol>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	68 * <li>Creates a simple add AST</li>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	69 * <li>Verifies its structure</li>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	70 * <li>"Probes" the add node by adding a {@link WrapperNode} and associated {@link Probe}</li>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	71 * <li>Attaches a simple {@link Instrument} to the node via the Probe's {@link ProbeNode}</li>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	72 * <li>Verifies the structure of the probed AST</li>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	73 * <li>Verifies the execution of the probed AST</li>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	74 * <li>Verifies the results observed by the instrument.</li>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	75 * </ol>
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	76 * To do these tests, several required classes have been implemented in their most basic form, only
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	77 * implementing the methods necessary for the tests to pass, with stubs elsewhere.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	78 */
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	79 public class InstrumentationTest {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	80
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	81 private static final SyntaxTag ADD_TAG = new SyntaxTag() {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	82
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	83 @Override
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	84 public String name() {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	85 return "Addition";
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	86 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	87
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	88 @Override
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	89 public String getDescription() {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	90 return "Test Language Addition Node";
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	91 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	92 };
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	93
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	94 private static final SyntaxTag VALUE_TAG = new SyntaxTag() {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	95
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	96 @Override
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	97 public String name() {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	98 return "Value";
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	99 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	100
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	101 @Override
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	102 public String getDescription() {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	103 return "Test Language Value Node";
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	104 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	105 };
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	106
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	107 @Test
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	108 public void testInstrumentationStructure() throws IllegalAccessException, SecurityException, IllegalArgumentException, NoSuchFieldException {
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	109
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	110 final Instrumenter instrumenter = InstrumentationTestNodes.createInstrumenter();
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	111 // Create a simple addition AST
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	112 final TruffleRuntime runtime = Truffle.getRuntime();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	113 final TestValueNode leftValueNode = new TestValueNode(6);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	114 final TestValueNode rightValueNode = new TestValueNode(7);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	115 final TestAdditionNode addNode = new TestAdditionNode(leftValueNode, rightValueNode);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	116
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	117 try {
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	118 instrumenter.probe(addNode);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	119 } catch (ProbeException e) {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	120 assertEquals(e.getFailure().getReason(), Reason.NO_PARENT);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	121 }
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	122 final TestRootNode rootNode = new TestRootNode(addNode, instrumenter);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	123
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	124 // Creating a call target sets the parent pointers in this tree and is necessary prior to
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	125 // checking any parent/child relationships
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	126 final CallTarget callTarget1 = runtime.createCallTarget(rootNode);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	127
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	128 // Check the tree structure
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	129 assertEquals(addNode, leftValueNode.getParent());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	130 assertEquals(addNode, rightValueNode.getParent());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	131 Iterator<Node> iterator = addNode.getChildren().iterator();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	132 assertEquals(leftValueNode, iterator.next());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	133 assertEquals(rightValueNode, iterator.next());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	134 assertFalse(iterator.hasNext());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	135 assertEquals(rootNode, addNode.getParent());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	136 iterator = rootNode.getChildren().iterator();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	137 assertEquals(addNode, iterator.next());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	138 assertFalse(iterator.hasNext());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	139
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	140 // Ensure it executes correctly
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	141 assertEquals(13, callTarget1.call());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	142
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	143 // Probe the addition node
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	144 instrumenter.probe(addNode);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	145
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	146 // Check the modified tree structure
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	147 assertEquals(addNode, leftValueNode.getParent());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	148 assertEquals(addNode, rightValueNode.getParent());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	149 iterator = addNode.getChildren().iterator();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	150 assertEquals(leftValueNode, iterator.next());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	151 assertEquals(rightValueNode, iterator.next());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	152 assertFalse(iterator.hasNext());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	153
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	154 // Ensure there's a WrapperNode correctly inserted into the AST
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	155 iterator = rootNode.getChildren().iterator();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	156 Node wrapperNode = iterator.next();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	157 assertTrue(wrapperNode instanceof TestLanguageWrapperNode);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	158 assertFalse(iterator.hasNext());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	159 assertEquals(rootNode, wrapperNode.getParent());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	160
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	161 // Check that the WrapperNode has both the probe and the wrapped node as children
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	162 iterator = wrapperNode.getChildren().iterator();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	163 assertEquals(addNode, iterator.next());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	164 ProbeNode probeNode = (ProbeNode) iterator.next();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	165 assertTrue(probeNode.getProbe() != null);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	166 assertFalse(iterator.hasNext());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	167
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	168 // Check that you can't probe the WrapperNodes
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	169 TestLanguageWrapperNode wrapper = (TestLanguageWrapperNode) wrapperNode;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	170 try {
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	171 instrumenter.probe(wrapper);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	172 fail();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	173 } catch (ProbeException e) {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	174 assertEquals(e.getFailure().getReason(), Reason.WRAPPER_NODE);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	175 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	176
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	177 // Check that the "probed" AST still executes correctly
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	178 assertEquals(13, callTarget1.call());
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	179 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	180
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	181 @Test
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	182 public void testListeners() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	183
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	184 final Instrumenter instrumenter = InstrumentationTestNodes.createInstrumenter();
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	185
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	186 // Create a simple addition AST
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	187 final TruffleRuntime runtime = Truffle.getRuntime();
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	188 final TestValueNode leftValueNode = new TestValueNode(6);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	189 final TestValueNode rightValueNode = new TestValueNode(7);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	190 final TestAdditionNode addNode = new TestAdditionNode(leftValueNode, rightValueNode);
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	191 final TestRootNode rootNode = new TestRootNode(addNode, instrumenter);
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	192
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	193 // Creating a call target sets the parent pointers in this tree and is necessary prior to
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	194 // checking any parent/child relationships
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	195 final CallTarget callTarget = runtime.createCallTarget(rootNode);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	196 // Probe the addition node
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	197 final Probe probe = instrumenter.probe(addNode);
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	198
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	199 // Check instrumentation with the simplest kind of counters.
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	200 // They should all be removed when the check is finished.
20889 73b1844b5b14 Truffle/Instrumentation: rename InstrumentListener to SimpleInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20885 diff changeset	201 checkCounters(probe, callTarget, rootNode, new TestSimpleInstrumentCounter(), new TestSimpleInstrumentCounter(), new TestSimpleInstrumentCounter());
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	202
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	203 // Now try with the more complex flavor of listener
20890 263ab98b3bf0 Truffle/Instrumentation: rename ASTInstrumentListener to StandardInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20889 diff changeset	204 checkCounters(probe, callTarget, rootNode, new TestStandardInstrumentCounter(), new TestStandardInstrumentCounter(), new TestStandardInstrumentCounter());
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	205 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	206
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	207 private static void checkCounters(Probe probe, CallTarget callTarget, RootNode rootNode, TestCounter counterA, TestCounter counterB, TestCounter counterC) {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	208
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	209 // Attach a counting instrument to the probe
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	210 counterA.attach(probe);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	211
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	212 // Attach a second counting instrument to the probe
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	213 counterB.attach(probe);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	214
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	215 // Run it again and check that the two instruments are working
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	216 assertEquals(13, callTarget.call());
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	217 assertEquals(counterA.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	218 assertEquals(counterA.leaveCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	219 assertEquals(counterB.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	220 assertEquals(counterB.leaveCount(), 1);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	221
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	222 // Remove counterA
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	223 counterA.dispose();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	224
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	225 // Run it again and check that instrument B is still working but not A
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	226 assertEquals(13, callTarget.call());
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	227 assertEquals(counterA.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	228 assertEquals(counterA.leaveCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	229 assertEquals(counterB.enterCount(), 2);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	230 assertEquals(counterB.leaveCount(), 2);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	231
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	232 // Simulate a split by cloning the AST
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	233 final CallTarget callTarget2 = Truffle.getRuntime().createCallTarget((TestRootNode) rootNode.copy());
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	234 // Run the clone and check that instrument B is still working but not A
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	235 assertEquals(13, callTarget2.call());
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	236 assertEquals(counterA.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	237 assertEquals(counterA.leaveCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	238 assertEquals(counterB.enterCount(), 3);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	239 assertEquals(counterB.leaveCount(), 3);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	240
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	241 // Run the original and check that instrument B is still working but not A
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	242 assertEquals(13, callTarget2.call());
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	243 assertEquals(counterA.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	244 assertEquals(counterA.leaveCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	245 assertEquals(counterB.enterCount(), 4);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	246 assertEquals(counterB.leaveCount(), 4);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	247
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	248 // Attach a second instrument to the probe
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	249 counterC.attach(probe);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	250
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	251 // Run the original and check that instruments B,C working but not A
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	252 assertEquals(13, callTarget.call());
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	253 assertEquals(counterA.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	254 assertEquals(counterA.leaveCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	255 assertEquals(counterB.enterCount(), 5);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	256 assertEquals(counterB.leaveCount(), 5);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	257 assertEquals(counterC.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	258 assertEquals(counterC.leaveCount(), 1);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	259
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	260 // Run the clone and check that instruments B,C working but not A
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	261 assertEquals(13, callTarget2.call());
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	262 assertEquals(counterA.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	263 assertEquals(counterA.leaveCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	264 assertEquals(counterB.enterCount(), 6);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	265 assertEquals(counterB.leaveCount(), 6);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	266 assertEquals(counterC.enterCount(), 2);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	267 assertEquals(counterC.leaveCount(), 2);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	268
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	269 // Remove instrumentC
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	270 counterC.dispose();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	271
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	272 // Run the original and check that instrument B working but not A,C
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	273 assertEquals(13, callTarget.call());
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	274 assertEquals(counterA.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	275 assertEquals(counterA.leaveCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	276 assertEquals(counterB.enterCount(), 7);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	277 assertEquals(counterB.leaveCount(), 7);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	278 assertEquals(counterC.enterCount(), 2);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	279 assertEquals(counterC.leaveCount(), 2);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	280
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	281 // Run the clone and check that instrument B working but not A,C
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	282 assertEquals(13, callTarget2.call());
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	283 assertEquals(counterA.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	284 assertEquals(counterA.leaveCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	285 assertEquals(counterB.enterCount(), 8);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	286 assertEquals(counterB.leaveCount(), 8);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	287 assertEquals(counterC.enterCount(), 2);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	288 assertEquals(counterC.leaveCount(), 2);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	289
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	290 // Remove instrumentB
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	291 counterB.dispose();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	292
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	293 // Run both the original and clone, check that no instruments working
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	294 assertEquals(13, callTarget.call());
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	295 assertEquals(13, callTarget2.call());
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	296 assertEquals(counterA.enterCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	297 assertEquals(counterA.leaveCount(), 1);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	298 assertEquals(counterB.enterCount(), 8);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	299 assertEquals(counterB.leaveCount(), 8);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	300 assertEquals(counterC.enterCount(), 2);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	301 assertEquals(counterC.leaveCount(), 2);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	302 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	303
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	304 @Test
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	305 public void testTagging() throws NoSuchFieldException, SecurityException, IllegalArgumentException, IllegalAccessException {
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	306 final Instrumenter instrumenter = InstrumentationTestNodes.createInstrumenter();
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	307
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	308 // Applies appropriate tags
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	309 final TestASTProber astProber = new TestASTProber(instrumenter);
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	310 instrumenter.registerASTProber(astProber);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	311
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	312 // Listens for probes and tags being added
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	313 final TestProbeListener probeListener = new TestProbeListener();
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	314 instrumenter.addProbeListener(probeListener);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	315
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	316 // Counts all entries to all instances of addition nodes
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	317 final TestMultiCounter additionCounter = new TestMultiCounter();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	318
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	319 // Counts all entries to all instances of value nodes
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	320 final TestMultiCounter valueCounter = new TestMultiCounter();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	321
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	322 // Create a simple addition AST
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	323 final TruffleRuntime runtime = Truffle.getRuntime();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	324 final TestValueNode leftValueNode = new TestValueNode(6);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	325 final TestValueNode rightValueNode = new TestValueNode(7);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	326 final TestAdditionNode addNode = new TestAdditionNode(leftValueNode, rightValueNode);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	327
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	328 final TestRootNode rootNode = new TestRootNode(addNode, instrumenter);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	329
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	330 final CallTarget callTarget = runtime.createCallTarget(rootNode);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	331
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	332 // Check that the prober added probes to the tree
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	333 assertEquals(probeListener.probeCount, 3);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	334 assertEquals(probeListener.tagCount, 3);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	335
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	336 assertEquals(instrumenter.findProbesTaggedAs(ADD_TAG).size(), 1);
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	337 assertEquals(instrumenter.findProbesTaggedAs(VALUE_TAG).size(), 2);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	338
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	339 // Check that it executes correctly
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	340 assertEquals(13, callTarget.call());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	341
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	342 // Dynamically attach a counter for all executions of all Addition nodes
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	343 for (Probe probe : instrumenter.findProbesTaggedAs(ADD_TAG)) {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	344 additionCounter.attachCounter(probe);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	345 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	346 // Dynamically attach a counter for all executions of all Value nodes
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	347 for (Probe probe : instrumenter.findProbesTaggedAs(VALUE_TAG)) {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	348 valueCounter.attachCounter(probe);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	349 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	350
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	351 // Counters initialized at 0
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	352 assertEquals(additionCounter.count, 0);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	353 assertEquals(valueCounter.count, 0);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	354
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	355 // Execute again
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	356 assertEquals(13, callTarget.call());
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	357
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	358 // There are two value nodes in the AST, but only one addition node
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	359 assertEquals(additionCounter.count, 1);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	360 assertEquals(valueCounter.count, 2);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	361
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	362 instrumenter.unregisterASTProber(astProber);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	363 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	364
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	365 private interface TestCounter {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	366
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	367 int enterCount();
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	368
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	369 int leaveCount();
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	370
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	371 void attach(Probe probe);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	372
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	373 void dispose();
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	374 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	375
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	376 /**
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	377 * A counter for the number of times execution enters and leaves a probed AST node.
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	378 */
20889 73b1844b5b14 Truffle/Instrumentation: rename InstrumentListener to SimpleInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20885 diff changeset	379 private class TestSimpleInstrumentCounter implements TestCounter {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	380
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	381 public int enterCount = 0;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	382 public int leaveCount = 0;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	383 public final Instrument instrument;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	384
20889 73b1844b5b14 Truffle/Instrumentation: rename InstrumentListener to SimpleInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20885 diff changeset	385 public TestSimpleInstrumentCounter() {
73b1844b5b14 Truffle/Instrumentation: rename InstrumentListener to SimpleInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20885 diff changeset	386 this.instrument = Instrument.create(new SimpleInstrumentListener() {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	387
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	388 public void enter(Probe probe) {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	389 enterCount++;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	390 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	391
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	392 public void returnVoid(Probe probe) {
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	393 leaveCount++;
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	394 }
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	395
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	396 public void returnValue(Probe probe, Object result) {
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	397 leaveCount++;
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	398 }
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	399
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	400 public void returnExceptional(Probe probe, Exception exception) {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	401 leaveCount++;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	402 }
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	403
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	404 }, "Instrumentation Test Counter");
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	405 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	406
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	407 @Override
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	408 public int enterCount() {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	409 return enterCount;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	410 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	411
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	412 @Override
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	413 public int leaveCount() {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	414 return leaveCount;
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	415 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	416
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	417 @Override
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	418 public void attach(Probe probe) {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	419 probe.attach(instrument);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	420 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	421
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	422 @Override
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	423 public void dispose() {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	424 instrument.dispose();
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	425 }
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	426 }
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	427
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	428 /**
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	429 * A counter for the number of times execution enters and leaves a probed AST node.
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	430 */
20890 263ab98b3bf0 Truffle/Instrumentation: rename ASTInstrumentListener to StandardInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20889 diff changeset	431 private class TestStandardInstrumentCounter implements TestCounter {
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	432
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	433 public int enterCount = 0;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	434 public int leaveCount = 0;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	435 public final Instrument instrument;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	436
20890 263ab98b3bf0 Truffle/Instrumentation: rename ASTInstrumentListener to StandardInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20889 diff changeset	437 public TestStandardInstrumentCounter() {
263ab98b3bf0 Truffle/Instrumentation: rename ASTInstrumentListener to StandardInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20889 diff changeset	438 this.instrument = Instrument.create(new StandardInstrumentListener() {
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	439
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	440 public void enter(Probe probe, Node node, VirtualFrame vFrame) {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	441 enterCount++;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	442 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	443
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	444 public void returnVoid(Probe probe, Node node, VirtualFrame vFrame) {
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	445 leaveCount++;
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	446 }
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	447
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	448 public void returnValue(Probe probe, Node node, VirtualFrame vFrame, Object result) {
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	449 leaveCount++;
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	450 }
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	451
e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	452 public void returnExceptional(Probe probe, Node node, VirtualFrame vFrame, Exception exception) {
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	453 leaveCount++;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	454 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	455
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	456 }, "Instrumentation Test Counter");
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	457 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	458
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	459 @Override
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	460 public int enterCount() {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	461 return enterCount;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	462 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	463
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	464 @Override
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	465 public int leaveCount() {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	466 return leaveCount;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	467 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	468
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	469 @Override
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	470 public void attach(Probe probe) {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	471 probe.attach(instrument);
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	472 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	473
20885 e7ece52e1ff3 Truffle/Instrumentation: remove two helper classes not adding enough value. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20106 diff changeset	474 @Override
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	475 public void dispose() {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	476 instrument.dispose();
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	477 }
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	478 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	479
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	480 /**
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	481 * Tags selected nodes on newly constructed ASTs.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	482 */
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	483 private static final class TestASTProber implements NodeVisitor, ASTProber {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	484
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	485 private final Instrumenter instrumenter;
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	486
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	487 TestASTProber(Instrumenter instrumenter) {
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	488 this.instrumenter = instrumenter;
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	489 }
3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	490
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	491 @Override
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	492 public boolean visit(Node node) {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	493 if (node instanceof TestLanguageNode) {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	494
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	495 final TestLanguageNode testNode = (TestLanguageNode) node;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	496
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	497 if (node instanceof TestValueNode) {
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	498 instrumenter.probe(testNode).tagAs(VALUE_TAG, null);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	499
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	500 } else if (node instanceof TestAdditionNode) {
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	501 instrumenter.probe(testNode).tagAs(ADD_TAG, null);
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	502
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	503 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	504 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	505 return true;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	506 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	507
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	508 @Override
22214 3aad794eec0e Truffle/Instrumentation: first large merge of instrumentation code into the TruffleVM framework Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 21951 diff changeset	509 public void probeAST(Instrumenter inst, Node node) {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	510 node.accept(this);
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	511 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	512 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	513
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	514 /**
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	515 * Counts the number of "enter" events at probed nodes using the simplest AST listener.
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	516 */
20889 73b1844b5b14 Truffle/Instrumentation: rename InstrumentListener to SimpleInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20885 diff changeset	517 static final class TestSimpleInstrumentListener extends DefaultSimpleInstrumentListener {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	518
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	519 public int counter = 0;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	520
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	521 @Override
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	522 public void enter(Probe probe) {
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	523 counter++;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	524 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	525 }
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	526
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	527 /**
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	528 * Counts the number of "enter" events at probed nodes using the AST listener.
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	529 */
20890 263ab98b3bf0 Truffle/Instrumentation: rename ASTInstrumentListener to StandardInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20889 diff changeset	530 static final class TestASTInstrumentListener extends DefaultStandardInstrumentListener {
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	531
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	532 public int counter = 0;
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	533
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	534 @Override
907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	535 public void enter(Probe probe, Node node, VirtualFrame vFrame) {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	536 counter++;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	537 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	538 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	539
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	540 /**
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	541 * A counter that can count executions at multiple nodes; it attaches a separate instrument at
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	542 * each Probe, but keeps a total count.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	543 */
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	544 private static final class TestMultiCounter {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	545
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	546 public int count = 0;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	547
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	548 public void attachCounter(Probe probe) {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	549
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	550 // Attach a new instrument for every Probe
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	551 // where we want to count executions.
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	552 // it will get copied when ASTs cloned, so
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	553 // keep the count in this outer class.
20889 73b1844b5b14 Truffle/Instrumentation: rename InstrumentListener to SimpleInstrumentListener Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 20885 diff changeset	554 probe.attach(Instrument.create(new DefaultSimpleInstrumentListener() {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	555
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	556 @Override
19818 907128d02b31 Truffle/Instrumentation: For clients of Instrumentation, replace the TruffleEventListener interface with two: InstrumentListener, and ASTInstrumentListener. The former is simple, completely Truffle-safe (can't affect Truffle execution), and designed for simple tools. The latter is similar to the previous interface. Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: 19518 diff changeset	557 public void enter(Probe p) {
18989 acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	558 count++;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	559 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	560 }, "Instrumentation Test MultiCounter"));
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	561 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	562 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	563
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	564 private static final class TestProbeListener extends DefaultProbeListener {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	565
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	566 public int probeCount = 0;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	567 public int tagCount = 0;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	568
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	569 @Override
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	570 public void newProbeInserted(Probe probe) {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	571 probeCount++;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	572 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	573
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	574 @Override
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	575 public void probeTaggedAs(Probe probe, SyntaxTag tag, Object tagValue) {
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	576 tagCount++;
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	577 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	578 }
acd822f17ef5 Truffle/Instrumentation: clean up and repair some old unit tests Michael Van De Vanter <michael.van.de.vanter@oracle.com> parents: diff changeset	579 }

Mercurial > hg > truffle

annotate truffle/com.oracle.truffle.api.test/src/com/oracle/truffle/api/test/instrument/InstrumentationTest.java @ 22219:1c0f490984d5