Enhancement for Bugzilla Bug 49743

	  	performance improvements for runtime library
(From Matthew)

2 files changed, 122 insertions, 0 deletions

diff --git a/runtime/testsrc/org/aspectj/runtime/reflect/RuntimePerformanceTest.java b/runtime/testsrc/org/aspectj/runtime/reflect/RuntimePerformanceTest.java
new file mode 100644
index 000000000..592bcd6a3
--- /dev/null
+++ b/runtime/testsrc/org/aspectj/runtime/reflect/RuntimePerformanceTest.java
@@ -0,0 +1,111 @@
+/*******************************************************************************
+ * Copyright (c) 2004 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials 
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ * 
+ * Contributors:
+ *     Matthew Webster - initial implementation
+ *******************************************************************************/
+package org.aspectj.runtime.reflect;
+
+import java.lang.reflect.Method;
+import java.util.Timer;
+import java.util.TimerTask;
+
+import org.aspectj.lang.Signature;
+
+import junit.framework.TestCase;
+
+public class RuntimePerformanceTest extends TestCase {
+
+	private static final Timer timer = new Timer(true);
+	private static final long TIMEOUT = 10000;
+	private static final long ITERATIONS = 1000000;
+	private static final long WARMUP_ITERATIONS = 10000;
+	private static final long EXPECTED_RATIO = 10;
+	private static final Factory factory = new Factory("RutimePerformanceTest.java",RuntimePerformanceTest.class);
+
+	private boolean savedUseCaches;
+	private Method method;
+	private Signature signature;
+
+	private TimerTask task;
+	private boolean abort;
+
+	public RuntimePerformanceTest(String name) {
+		super(name);
+	}
+
+	protected void setUp() throws Exception {
+		super.setUp();
+		
+		/* Save default state */
+		savedUseCaches = SignatureImpl.getUseCache();
+		
+		/* If a test takes too long we can kill it and fail */
+		abort = false;
+		task = new TimerTask() {
+			public void run () {
+				abort = true;	
+			}
+		};
+		timer.schedule(task,TIMEOUT);
+	}
+	
+	protected void tearDown() throws Exception {
+		super.tearDown();
+		
+		/* Restore default state */
+		SignatureImpl.setUseCache(savedUseCaches);
+
+		task.cancel();
+	}
+
+	public void testToString () {
+		Signature signature = makeMethodSig("test");
+
+		SignatureImpl.setUseCache(false);
+		warmUp(signature);
+		long noCache = invokeSignatureToString(signature,ITERATIONS/EXPECTED_RATIO);
+		System.out.println("noCache=" + noCache);
+
+		SignatureImpl.setUseCache(true);
+		warmUp(signature);
+		long cache = invokeSignatureToString(signature,ITERATIONS);
+		System.out.println("cache=" + cache);
+
+		long ratio = (EXPECTED_RATIO*noCache/cache);
+		System.out.println("ratio=" + ratio);
+		assertTrue("Using cache should be " + EXPECTED_RATIO + " times faster: " + ratio,(ratio > EXPECTED_RATIO));
+	}
+	
+	private long invokeSignatureToString (Signature sig, long iterations) {
+		long start = System.currentTimeMillis();
+		String s;
+
+		for (long l = 0; !abort && (l < iterations); l++) {
+			s = sig.toShortString();
+			s = sig.toString();
+			s = sig.toLongString();
+		}
+		if (abort) throw new RuntimeException("invokeSignatureToString aborted after " + (TIMEOUT/1000) + " seconds");
+
+		long finish = System.currentTimeMillis();
+		return (finish-start);		
+	}
+	
+	private void warmUp (Signature sig) {
+		invokeSignatureToString(sig,WARMUP_ITERATIONS);	 
+	}
+	
+	private Signature makeMethodSig (String methodName) {
+		Class clazz = getClass();
+		Class[] parameterTypes = new Class[] { String.class };
+		String[] parameterNames = new String[] { "s" };
+		Class[] exceptionTypes = new Class[] {};
+		Class returnType = Void.TYPE;
+		return factory.makeMethodSig(1,methodName,clazz,parameterTypes,parameterNames,exceptionTypes,returnType);
+	}
+}
\ No newline at end of file
diff --git a/runtime/testsrc/org/aspectj/runtime/reflect/SignatureTest.java b/runtime/testsrc/org/aspectj/runtime/reflect/SignatureTest.java
index b8170d649..533280fcd 100644
--- a/runtime/testsrc/org/aspectj/runtime/reflect/SignatureTest.java
+++ b/runtime/testsrc/org/aspectj/runtime/reflect/SignatureTest.java
@@ -20,4 +20,15 @@ public class SignatureTest extends TestCase {
 		assertEquals(SignatureTest.class.getName(),fsi.getDeclaringTypeName());
 		assertSame(fsi.getDeclaringTypeName(),fsi.getDeclaringTypeName()); // should be cached.
 	}
+	
+	public void testToShortMiddleLongString () {
+		MethodSignatureImpl msi = new MethodSignatureImpl(0,"test",SignatureTest.class,new Class[] { String.class, Integer.TYPE }, new String[] { "s", "i" }, new Class[] {}, Runnable.class);
+		String shortString = msi.toShortString();
+		assertSame(shortString,msi.toShortString()); // should be cached.
+		String middleString = msi.toString();
+		assertSame(middleString,msi.toString()); // should be cached.
+		String longString = msi.toLongString();
+		assertSame(longString,msi.toLongString()); // should be cached.
+		assertTrue("String representations should be different",!(shortString.equals(middleString) || middleString.equals(longString) || longString.equals(shortString)));
+	}
 }