76030 - cflow optimizations. Part 2 fix - share counters and stacks when we can.

1 files changed, 76 insertions, 0 deletions

diff --git a/tests/cflow/CounterTest04.java b/tests/cflow/CounterTest04.java
new file mode 100644
index 000000000..9f20e940b
--- /dev/null
+++ b/tests/cflow/CounterTest04.java
@@ -0,0 +1,76 @@
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * In this test, we have multiple identical cflow() pointcut 'pieces' used in a number of
+ * pointcuts.  We are not naming a cflow() and reusing it, we are just duplicating the
+ * pointcut in multiple places - can we share counters?
+ */
+public class CounterTest04 {
+
+	public static void main(String []argv) {
+		new CounterTest04().sayMessage();
+		int ctrs = ReflectionHelper.howManyCflowCounterFields(Cflow1.aspectOf());
+//		if (ctrs!=2) {
+//			throw new RuntimeException("Should be two cflow counters, but found: "+ctrs);
+//		}
+		int stacks = ReflectionHelper.howManyCflowStackFields(Cflow1.aspectOf());
+		if (stacks!=2) {
+			throw new RuntimeException("Should be two cflow stacks, but found: "+stacks);
+		}
+	}
+	
+	public void sayMessage() {
+		printmsg("Hello "); printmsg("World\n");
+	}
+	
+	public void printmsg(String msg) {
+		System.out.print(msg);
+	}
+}
+
+aspect Cflow1 {
+	
+	// CflowCounter created for this pointcut should be shared below!
+	pointcut p1(Object o): cflow(execution(* main(..)) && args(o));
+	
+	before(Object o): call(* print(..)) && p1(o) {
+		// Managed by a CflowCounter
+	}
+	
+	before(Object o): call(* print(..)) && p1(o) {
+		// Managed by a CflowCounter
+	}
+	
+	before(Object o): execution(* print(..)) && cflow(execution(* main(..)) && target(o)) {
+		// Managed by a CflowStack - since state is exposed
+	}
+}
+
+class ReflectionHelper {
+  public static List getCflowfields(Object o,boolean includeCounters,boolean includeStacks) {
+  	List res = new ArrayList();
+  	Class clazz = o.getClass();
+  	Field[] fs = clazz.getDeclaredFields();
+  	for (int i = 0; i < fs.length; i++) {
+		Field f = fs[i];
+		if ((f.getType().getName().endsWith("CFlowCounter") && includeCounters) ||
+			(f.getType().getName().endsWith("CFlowStack") && includeStacks)) {
+			res.add(f.getType().getName()+":"+f.getName());
+		}
+	}
+  	return res;
+  }
+  
+  public static int howManyCflowCounterFields(Object o) {
+    return getCflowfields(o,true,false).size();
+  }
+  
+  public static int howManyCflowStackFields(Object o) {
+    return getCflowfields(o,false,true).size();
+  }
+  
+}