diff --git a/TracerOnJavassist/src/tracer/JSONTraceGenerator.java b/TracerOnJavassist/src/tracer/JSONTraceGenerator.java index f9f0f65..83ec795 100644 --- a/TracerOnJavassist/src/tracer/JSONTraceGenerator.java +++ b/TracerOnJavassist/src/tracer/JSONTraceGenerator.java @@ -32,7 +32,7 @@ keys.add("lineNum"); values.add(lineNum); keys.add("time"); values.add(timeStamp); return "$proceed($$); " + - "tracer.MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; + Tracer.TRACER + "MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; } @Override @@ -52,7 +52,7 @@ keys.add("lineNum"); values.add(lineNum); keys.add("time"); values.add(timeStamp); return "$_ = $proceed(); " + - "tracer.MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; + Tracer.TRACER + "MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; } @@ -69,7 +69,7 @@ keys.add("lineNum"); values.add(lineNum); keys.add("time"); values.add(timeStamp); return "$_ = $proceed($$); " + - "tracer.MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; + Tracer.TRACER + "MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; } @Override @@ -98,7 +98,7 @@ keys.add("args"); values.add(generateJSONArrayGenerator(argList)); keys.add("threadId"); values.add(threadId); keys.add("time"); values.add(timeStamp); - return "tracer.MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; + return Tracer.TRACER + "MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; } @Override @@ -120,7 +120,7 @@ keys.add("returnValue"); values.add(generateJSONObjectGenerator(returnedClass, returnedObject)); keys.add("threadId"); values.add(threadId); keys.add("time"); values.add(timeStamp); - return "tracer.MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; + return Tracer.TRACER + "MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; } @Override @@ -131,7 +131,7 @@ keys.add("callerSideSignature"); values.add(DQ_GEN + " + \"" + m.getLongName().replace('$', '.') + "\" + " + DQ_GEN); // AspectJ�ł̓��\�b�h�V�O�j�`�����ł͖����N���X�̓h�b�g�ŋ�؂��� keys.add("threadId"); values.add(threadId); keys.add("lineNum"); values.add(lineNum); - return "tracer.MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; + return Tracer.TRACER + "MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; } @Override @@ -149,7 +149,7 @@ keys.add("threadId"); values.add(threadId); keys.add("lineNum"); values.add(lineNum); keys.add("time"); values.add(timeStamp); - return "tracer.MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; + return Tracer.TRACER + "MyPrintStream.println(" + generateJSONMapGenerator(keys, values) + " + \",\");"; } private String generateJSONObjectGenerator(String className, String objectId) { diff --git a/TracerOnJavassist/src/tracer/PlainTextTraceGenerator.java b/TracerOnJavassist/src/tracer/PlainTextTraceGenerator.java index f3d3aff..19ce09c 100644 --- a/TracerOnJavassist/src/tracer/PlainTextTraceGenerator.java +++ b/TracerOnJavassist/src/tracer/PlainTextTraceGenerator.java @@ -13,15 +13,15 @@ * */ public class PlainTextTraceGenerator implements ITraceGenerator { - public static final String LINE_AND_THREAD = "\":Line \" + (tracer.Tracer.lineNo++) + \":ThreadNo \" + "; - public static final String LINE = "\":Line \" + (tracer.Tracer.lineNo++) + \":\""; + public static final String LINE_AND_THREAD = "\":Line \" + (" + Tracer.TRACER + "Tracer.lineNo++) + \":ThreadNo \" + "; + public static final String LINE = "\":Line \" + (" + Tracer.TRACER + "Tracer.lineNo++) + \":\""; @Override public String generateReplaceStatementsForFieldSet( String fieldName, String containerClass, String containerObject, String valueClass, String valueObject, String threadId, String lineNum, String timeStamp) { return "$proceed($$); " + - "tracer.MyPrintStream.println(\"set:\" + " + containerClass + " + \":\" + " + containerObject + " + \":\" + " + + Tracer.TRACER + "MyPrintStream.println(\"set:\" + " + containerClass + " + \":\" + " + containerObject + " + \":\" + " + valueClass + " + \":\" + " + valueObject + " + " + LINE_AND_THREAD + threadId + ");"; } @@ -30,7 +30,7 @@ String fieldName, String thisClass, String thisObject, String containerClass, String containerObject, String valueClass, String valueObject, String threadId, String lineNum, String timeStamp) { return "$_ = $proceed(); " + - "tracer.MyPrintStream.println(\"get:\" + " + thisClass + " + \":\" + " + thisObject + " + \":\" + " + + Tracer.TRACER + "MyPrintStream.println(\"get:\" + " + thisClass + " + \":\" + " + thisObject + " + \":\" + " + containerClass + " + \":\" + " + containerObject + " + \":\" + " + valueClass + " + \":\" + " + valueObject + " + " + LINE_AND_THREAD + threadId + ");"; } @@ -52,7 +52,7 @@ String classOutput = ""; String argsOutput = ""; // �����̏o�� - String delimiter = "tracer.MyPrintStream.println(\"Args:\" + "; + String delimiter = Tracer.TRACER + "MyPrintStream.println(\"Args:\" + "; for (int p = 0; p < argClasses.size(); p++) { argsOutput += delimiter + argClasses.get(p) + " + \":\" + " + argObjects.get(p); delimiter = " + \":\" + "; @@ -62,11 +62,11 @@ } if (m instanceof CtConstructor) { // �R���X�g���N�^�̏ꍇ - newOutput = "tracer.MyPrintStream.println(\"New \" + " + thisClass + " + \":\" + " + thisObject + " + " + LINE_AND_THREAD + threadId + ");"; + newOutput = Tracer.TRACER + "MyPrintStream.println(\"New \" + " + thisClass + " + \":\" + " + thisObject + " + " + LINE_AND_THREAD + threadId + ");"; } - methodOutput = "tracer.MyPrintStream.println(\"Method \" + " + thisClass + " + \",\" + " + methodSignature + methodOutput = Tracer.TRACER + "MyPrintStream.println(\"Method \" + " + thisClass + " + \",\" + " + methodSignature + " + \":\" + " + thisObject + " + " + LINE + " + " + timeStamp + " + \":ThreadNo \" + " + threadId + ");"; - classOutput = "tracer.MyPrintStream.println(\"Class \" + " + thisClass + " + \":\" + " + thisObject + " + " + LINE_AND_THREAD + threadId + ");"; + classOutput = Tracer.TRACER + "MyPrintStream.println(\"Class \" + " + thisClass + " + \":\" + " + thisObject + " + " + LINE_AND_THREAD + threadId + ");"; return newOutput + methodOutput + classOutput + argsOutput; } @@ -94,8 +94,8 @@ } } - String returnOutput = "tracer.MyPrintStream.print(\"Return " + invocationType + "(" + shortName + "):\" + " + returnedClass + " + \":\" + " + returnedObject + " + \":\");" + - "tracer.MyPrintStream.println(\"\" + " + thisObject + " + " + LINE_AND_THREAD + threadId + ");"; + String returnOutput = Tracer.TRACER + "MyPrintStream.print(\"Return " + invocationType + "(" + shortName + "):\" + " + returnedClass + " + \":\" + " + returnedObject + " + \":\");" + + Tracer.TRACER + "MyPrintStream.println(\"\" + " + thisObject + " + " + LINE_AND_THREAD + threadId + ");"; return returnOutput; } diff --git a/TracerOnJavassist/src/tracer/Tracer.java b/TracerOnJavassist/src/tracer/Tracer.java index b8858c6..7403baf 100644 --- a/TracerOnJavassist/src/tracer/Tracer.java +++ b/TracerOnJavassist/src/tracer/Tracer.java @@ -31,11 +31,11 @@ */ public class Tracer { public static int lineNo = 1; + public static final String TRACER = "tracer."; private static final String STANDARD_CLASSES = "java.util.ListIterator|java.util.Iterator|java.util.List|java.util.Vector|java.util.ArrayList|java.util.Stack|java.util.Map|java.util.HashMap|java.util.Set|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread"; private static final String CONCRETE_STANDARD_CLASSES = "java.util.Vector|java.util.ArrayList|java.util.Stack |java.util.HashMap|java.util.HashSet|java.util.Hashtable|java.util.LinkedList|java.lang.Thread"; private static final String EXCEPT_FOR_METHODS = "java.lang.Thread.currentThread..|java.lang.Thread.getId.."; private static final String STANDARD_LIB = "java."; - private static final String TRACER = "tracer."; private static OutputStatementsGenerator outputStatementsGenerator = null; private static CodeConverter conv = new CodeConverter(); @@ -57,7 +57,7 @@ ClassPool cp = ClassPool.getDefault(); CtClass cc; try { - cc = cp.get("tracer.JSONArrayAdvisor"); // JSON�̏ꍇ�̂ݔz��A�N�Z�X���o�͂��� + cc = cp.get(TRACER + "JSONArrayAdvisor"); // JSON�̏ꍇ�̂ݔz��A�N�Z�X���o�͂��� conv.replaceArrayAccess(cc, new CodeConverter.DefaultArrayAccessReplacementMethodNames()); } catch (NotFoundException e1) { e1.printStackTrace(); diff --git a/TracerOnJavassist/src/tracer/TracerClassLoader.java b/TracerOnJavassist/src/tracer/TracerClassLoader.java index b6f225c..132edc4 100644 --- a/TracerOnJavassist/src/tracer/TracerClassLoader.java +++ b/TracerOnJavassist/src/tracer/TracerClassLoader.java @@ -16,7 +16,7 @@ if (!Tracer.isInitialized()) Tracer.initialize(new OutputStatementsGenerator(new JSONTraceGenerator())); // �����ŏo�̓t�H�[�}�b�g���w�肷�� // "java"�Ŏn�܂�p�b�P�[�W�̓V�X�e���n�Ȃ̂Ńf�t�H���g�̃N���X���[�_�[�ɔC���� - if (name.startsWith("java") || name.startsWith("sun.") || name.startsWith("tracer.")) { + if (name.startsWith("java") || name.startsWith("sun.") || name.startsWith(Tracer.TRACER)) { return super.loadClass(name, resolve); }