TODO: Note: the scope of the options can be ClassLoader aware but should be assumed JVM wide
******************************************************************************************************************************-->
<!ELEMENT weaver (
- (include | exclude)*
+ (include | exclude | dump)*
)>
<!ATTLIST weaver
options CDATA #IMPLIED
within CDATA #REQUIRED
>
<!--*****************************************************************************************************************************
+dump
+*********************************************************************************************************************************
+[dump] control post-weaving dump to the "./_dump" folder (debugging purpose only)
+@within defines a type pattern
+ (it is not a startWith)
+******************************************************************************************************************************-->
+<!ELEMENT dump EMPTY>
+<!ATTLIST dump
+ within CDATA #REQUIRED
+>
+<!--*****************************************************************************************************************************
aspects
*********************************************************************************************************************************
[aspects] defines a set of aspects
}
try {
- byte[] weaved = WeaverContainer.getWeaver(loader).weaveClass(className, bytes);
- //FIXME AV make dump optionnal and configurable
- __dump(className, weaved);
+ WeavingAdaptor weavingAdaptor = WeaverContainer.getWeaver(loader);
+ byte[] weaved = weavingAdaptor.weaveClass(className, bytes);
+ if (weavingAdaptor.shouldDump(className.replace('/', '.'))) {
+ dump(className, weaved);
+ }
return weaved;
} catch (Throwable t) {
//FIXME AV wondering if we should have the option to fail (throw runtime exception) here
}
/**
- * Dump the given bytcode in _dump/...
+ * Dump the given bytcode in _dump/... (dev mode)
*
* @param name
* @param b
* @throws Throwable
*/
- static void __dump(String name, byte[] b) throws Throwable {
- if (true) return;//FIXME AV have an option
+ static void dump(String name, byte[] b) throws Throwable {
String className = name.replace('.', '/');
final File dir;
if (className.indexOf('/') > 0) {
- dir = new File("_dump" + File.separator + className.substring(0, className.lastIndexOf('/')));
+ dir = new File("_ajdump" + File.separator + className.substring(0, className.lastIndexOf('/')));
} else {
- dir = new File("_dump");
+ dir = new File("_ajdump");
}
dir.mkdirs();
- String fileName = "_dump" + File.separator + className + ".class";
+ String fileName = "_ajdump" + File.separator + className + ".class";
FileOutputStream os = new FileOutputStream(fileName);
os.write(b);
os.close();
*******************************************************************************/
package org.aspectj.weaver.loadtime;
-import java.io.File;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.Iterator;
-import java.util.List;
-
import org.aspectj.asm.IRelationship;
import org.aspectj.bridge.IMessage;
import org.aspectj.bridge.ISourceLocation;
import org.aspectj.weaver.tools.GeneratedClassHandler;
import org.aspectj.weaver.tools.WeavingAdaptor;
+import java.io.File;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+
/**
* @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
*/
private final static String AOP_XML = "META-INF/aop.xml";
- //ATAJ LTW include/exclude
+ private List m_dumpTypePattern = new ArrayList();
private List m_includeTypePattern = new ArrayList();
private List m_excludeTypePattern = new ArrayList();
private List m_aspectExcludeTypePattern = new ArrayList();
- public void addIncludeTypePattern(TypePattern typePattern) {
- m_includeTypePattern.add(typePattern);
- }
- public void addExcludeTypePattern(TypePattern typePattern) {
- m_excludeTypePattern.add(typePattern);
- }
- public void addAspectExcludeTypePattern(TypePattern typePattern) {
- m_aspectExcludeTypePattern.add(typePattern);
- }
public ClassLoaderWeavingAdaptor(final ClassLoader loader) {
super(null);// at this stage we don't have yet a generatedClassHandler to define to the VM the closures
public void acceptClass(String name, byte[] bytes) {
//TODO av make dump configurable
try {
- Aj.__dump(name, bytes);
+ if (shouldDump(name.replace('/', '.'))) {
+ Aj.dump(name, bytes);
+ }
} catch (Throwable throwable) {
throwable.printStackTrace();
}
registerAspectExclude(weaver, loader, definitions);
registerAspects(weaver, loader, definitions);
registerIncludeExclude(weaver, loader, definitions);
+ registerDump(weaver, loader, definitions);
} catch (Exception e) {
weaver.getWorld().getMessageHandler().handleMessage(
new Message("Register definition failed", IMessage.WARNING, e, null)
world.setXlazyTjp(weaverOption.lazyTjp);
weaver.setReweavableMode(weaverOption.reWeavable, false);
world.setXnoInline(weaverOption.noInline);
- world.setBehaveInJava5Way(weaverOption.java5);
+ world.setBehaveInJava5Way(weaverOption.java5);//TODO should be autodetected ?
//TODO proceedOnError option
}
}
}
+ /**
+ * Register the dump filter
+ *
+ * @param weaver
+ * @param loader
+ * @param definitions
+ */
+ private void registerDump(final BcelWeaver weaver, final ClassLoader loader, final List definitions) {
+ for (Iterator iterator = definitions.iterator(); iterator.hasNext();) {
+ Definition definition = (Definition) iterator.next();
+ for (Iterator iterator1 = definition.getDumpPatterns().iterator(); iterator1.hasNext();) {
+ String dump = (String) iterator1.next();
+ TypePattern pattern = new PatternParser(dump).parseTypePattern();
+ m_dumpTypePattern.add(pattern);
+ }
+ }
+ }
+
protected boolean accept(String className) {
// avoid ResolvedType if not needed
if (m_excludeTypePattern.isEmpty() && m_includeTypePattern.isEmpty()) {
}
for (Iterator iterator = m_includeTypePattern.iterator(); iterator.hasNext();) {
TypePattern typePattern = (TypePattern) iterator.next();
- if (! typePattern.matchesStatically(classInfo)) {
+ if (!typePattern.matchesStatically(classInfo)) {
// include does not match - skip
return false;
}
return true;
}
+ public boolean shouldDump(String className) {
+ // avoid ResolvedType if not needed
+ if (m_dumpTypePattern.isEmpty()) {
+ return false;
+ }
+ //TODO AV - optimize for className.startWith only
+ ResolvedTypeX classInfo = weaver.getWorld().getCoreType(TypeX.forName(className));
+ //dump
+ for (Iterator iterator = m_dumpTypePattern.iterator(); iterator.hasNext();) {
+ TypePattern typePattern = (TypePattern) iterator.next();
+ if (typePattern.matchesStatically(classInfo)) {
+ // dump match
+ return true;
+ }
+ }
+ return false;
+ }
}
private StringBuffer m_weaverOptions;
+ private List m_dumpPatterns;
+
private List m_includePatterns;
private List m_excludePatterns;
public Definition() {
m_weaverOptions = new StringBuffer();
+ m_dumpPatterns = new ArrayList(0);
m_includePatterns = new ArrayList(0);
m_excludePatterns = new ArrayList(0);
m_aspectClassNames = new ArrayList();
return m_weaverOptions.toString();
}
+ public List getDumpPatterns() {
+ return m_dumpPatterns;
+ }
+
public List getIncludePatterns() {
return m_includePatterns;
}
private final static String ASPECTJ_ELEMENT = "aspectj";
private final static String WEAVER_ELEMENT = "weaver";
+ private final static String DUMP_ELEMENT = "dump";
private final static String INCLUDE_ELEMENT = "include";
private final static String EXCLUDE_ELEMENT = "exclude";
private final static String OPTIONS_ATTRIBUTE = "options";
private final static String WITHIN_ATTRIBUTE = "within";
private final static String EXPRESSION_ATTRIBUTE = "expression";
-
private final Definition m_definition;
private boolean m_inAspectJ;
if (!isNull(typePattern)) {
m_definition.getExcludePatterns().add(typePattern);
}
+ } else if (DUMP_ELEMENT.equals(qName) && m_inWeaver) {
+ String typePattern = attributes.getValue(WITHIN_ATTRIBUTE);
+ if (!isNull(typePattern)) {
+ m_definition.getDumpPatterns().add(typePattern);
+ }
} else if (EXCLUDE_ELEMENT.equals(qName) && m_inAspects) {
String typePattern = attributes.getValue(WITHIN_ATTRIBUTE);
if (!isNull(typePattern)) {
assertEquals("foo..bar.Goo+", def.getIncludePatterns().get(0));
assertEquals("@Baz", def.getAspectExcludePatterns().get(0));
-
+ assertEquals("foo..*", def.getDumpPatterns().get(0));
}
}
<aspectj>
<weaver options="-showWeaveInfo">
<include within="foo..bar.Goo+"/>
+ <dump within="foo..*"/>
</weaver>
<aspects>
<exclude within="@Baz"/>
</java>
</target>
+ <target name="ltw.DumpTest">
+ <java fork="yes" classname="ataspectj.DumpTest" failonerror="yes">
+ <classpath refid="aj.path"/>
+ <jvmarg value="-javaagent:${aj.root}/lib/test/loadtime5.jar"/>
+ <jvmarg value="-Daj5.def=ataspectj/aop-dump.xml"/>
+ </java>
+ </target>
+
<target name="javac.ltw" depends="compile:javac, ltw"/>
</project>
\ No newline at end of file
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandre Vasseur initial implementation
+ *******************************************************************************/
+package ataspectj;
+
+import junit.framework.TestCase;
+
+import java.io.File;
+
+/**
+ * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
+ */
+public class DumpTest extends TestCase {
+
+ public static void main(String[] args) {
+ TestHelper.runAndThrowOnFailure(suite());
+ }
+
+ public static junit.framework.Test suite() {
+ return new junit.framework.TestSuite(DumpTest.class);
+ }
+
+ public void testDump() {
+ File f = new File("_ajdump/ataspectj/DumpTest.class");
+ assertFalse(f.exists());
+
+ DumpTestTheDump forceLoad = new DumpTestTheDump();
+ f = new File("_ajdump/ataspectj/DumpTestTheDump.class");
+ assertTrue(f.exists());
+ }
+
+}
--- /dev/null
+/*******************************************************************************
+ * Copyright (c) 2005 Contributors.
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * Alexandre Vasseur initial implementation
+ *******************************************************************************/
+package ataspectj;
+
+/**
+ * @author <a href="mailto:alex AT gnilux DOT com">Alexandre Vasseur</a>
+ */
+public class DumpTestTheDump {
+}
--- /dev/null
+<?xml version="1.0"?>
+<aspectj>
+ <weaver options="-XmessageHolderClass:ataspectj.TestHelper">
+ <dump within="ataspectj.DumpTestThe*"/>
+ </weaver>
+</aspectj>
runTest("AjcLTW AroundInlineMungerTest2");
}
+ public void testLTWDump() {
+ runTest("LTW DumpTest");
+ }
+
}
options="-1.5 -Xreweavable"/>
<ant file="ajc-ant.xml" target="ltw.AroundInlineMungerTest2" verbose="true"/>
</ajc-test>
+
+ <ajc-test dir="java5/ataspectj" title="LTW DumpTest">
+ <compile
+ files="ataspectj/DumpTest.java,ataspectj/DumpTestTheDump.java,ataspectj/TestHelper.java"
+ options="-1.5"/>
+ <ant file="ajc-ant.xml" target="ltw.DumpTest" verbose="true"/>
+ </ajc-test>
+
</suite>
\ No newline at end of file
int numArgs = advice.getSignature().getParameterTypes().length;
if (numFormals > 0) {
names = advice.getSignature().getParameterNames(world);
- System.out.println(advice.getSignature().toLongString());//AVB
validateBindings(newP,p,numArgs,names);
}
} else {
*/
public byte[] weaveClass (String name, byte[] bytes) throws IOException {
if (shouldWeave(name)) {
- System.out.println("WeavingAdaptor.weaveClass " + name);
+ //System.out.println("WeavingAdaptor.weaveClass " + name);
info("weaving '" + name + "'");
bytes = getWovenBytes(name, bytes);
}
return true;
}
+ public boolean shouldDump(String name) {
+ return false;
+ }
+
private boolean shouldWeaveName (String name) {
return !((/*(name.startsWith("org.apache.bcel.")//FIXME AV why ? bcel is wrapped in org.aspectj.
||*/ name.startsWith("org.aspectj.")
projects / aspectj.git / commitdiff