method-level tracing to lower overhead

org.intrace/build.xml

@@ -175,7 +175,7 @@
   </target>
 
   <target name="test" description="Run Tests" depends="build" >
-    <property name="emma.enabled" value="true" />
+    <property name="emma.enabled" value="false" />
 
     <mkdir dir="./reports" />
     <mkdir dir="./reports/junit" />
@@ -239,7 +239,7 @@
 
       <batchtest fork="yes" todir="./reports/junit/raw">
         <fileset dir="./testsrc">
-          <include name="**/agent/*Test.java"/>
+          <include name="**/agent/*Test.java"/> 
         </fileset>
       </batchtest>
     </junit>
@@ -395,7 +395,7 @@
 
   <target name="example_build">
     <mkdir dir="./build/test" />
-    <javac destdir="./build/test" debug="true" source="1.6" target="1.6"
+    <javac destdir="./build/test" debug="true" source="1.7" target="1.7"
            includeantruntime="false">
       <src path="./testsrc"/>
       <classpath>
@@ -415,6 +415,16 @@
     </java>
   </target>
 
+  <target name="example2" depends="jar,example_build">
+    <java classname="org.intracetest.agent.ArgumentTypes" fork="true">
+      <classpath>
+        <pathelement path="./build/test" />
+      </classpath>
+      <jvmarg value="-javaagent:build/jars/intrace-agent.jar=[instru-true" />
+    </java>
+  </target>
+
+
   <target name="waitexample" depends="jar,example_build">
     <java classname="example.TraceExample" fork="true">
       <arg value="5000" />

org.intrace/src/org/intrace/agent/AgentSettings.java

@@ -5,16 +5,19 @@
 import java.util.Locale;
 import java.util.Map;
 
+import org.intrace.output.trace.TraceHandler;
 import org.intrace.shared.AgentConfigConstants;
 
 /**
  * Args Format: "[arg1[arg2[arg3"
  * 
  * where argx is of the form value-parameter
  */
-public class AgentSettings
+public class AgentSettings implements VerboseLogger
 {
-  // Static settings which control agent startup
+
+
+// Static settings which control agent startup
   private int serverPort = 9123;
   private int callbackPort = -1;
   private boolean waitStart = false;
@@ -24,28 +27,40 @@ public class AgentSettings
 
   // Dynamic settings
   private boolean gzipEnabled = false;
-  private String[] classRegex = new String[0];
-  private String[] excludeClassRegex = new String[0];
+  private InstrCriteria classesToInclude = null;
+  public InstrCriteria getClassesToInclude() {
+	return classesToInclude;
+}
+
+
+public InstrCriteria getClassesToExclude() {
+	return classesToExclude;
+}
+
+private InstrCriteria classesToExclude = null;
   private boolean instruEnabled = true;
   private boolean saveTracedClassfiles = false;
   private boolean verboseMode = false;  
 
-  public AgentSettings(String args)
-  {
-    parseArgs(args);
-  }
+
 
   public AgentSettings(AgentSettings oldInstance)
   {
     // Copy all static state and dynamic settings
     actualServerPort = oldInstance.getActualServerPort();
     gzipEnabled = oldInstance.isGzipEnabled();
-    classRegex = oldInstance.getClassRegex();
-    excludeClassRegex = oldInstance.getExcludeClassRegex();
+    this.classesToInclude = oldInstance.classesToInclude;
+    this.classesToExclude = oldInstance.classesToExclude;
+
+
     instruEnabled = oldInstance.isInstrumentationEnabled();
     saveTracedClassfiles = oldInstance.saveTracedClassfiles();
     verboseMode = oldInstance.isVerboseMode();
   }
+  public AgentSettings(String args)
+  {
+    parseArgs(args);
+  }
 
   public boolean isGzipEnabled() {
 	  return gzipEnabled;
@@ -127,15 +142,17 @@ else if (arg.toLowerCase(Locale.ROOT).equals(AgentConfigConstants.GZIP + "false"
     else if (arg.startsWith(AgentConfigConstants.CLASS_REGEX))
     {
       String classRegexStr = arg.replace(AgentConfigConstants.CLASS_REGEX, "");
-      classRegex = classRegexStr.split("\\|");
+      this.classesToInclude = new InstrCriteria(classRegexStr);
+      this.classesToInclude.verboseLogger = this;
     }
     else if (arg.startsWith(AgentConfigConstants.EXCLUDE_CLASS_REGEX))
     {
       String classExcludeRegexStr = arg
                                        .replace(
                                                 AgentConfigConstants.EXCLUDE_CLASS_REGEX,
                                                 "");
-      excludeClassRegex = classExcludeRegexStr.split("\\|");
+      this.classesToExclude = new InstrCriteria(classExcludeRegexStr);
+      this.classesToExclude.verboseLogger = this;
     }
   }
 
@@ -166,12 +183,18 @@ public int getCallbackPort()
 
   public String[] getClassRegex()
   {
-    return classRegex;
+	  String[] rc = {};
+	  if (this.classesToInclude!=null)
+		  rc = this.classesToInclude.getClassRegex(); 
+    return rc;
   }
 
   public String[] getExcludeClassRegex()
   {
-    return excludeClassRegex;
+	  String[] rc = {};
+	  if (this.classesToExclude!=null)
+		  rc = this.classesToInclude.getClassRegex(); 
+    return rc;
   }
 
   public boolean isInstrumentationEnabled()
@@ -195,8 +218,17 @@ public String toString()
     // Output key settings
     String currentSettings = "";
     currentSettings += "GZip Enabled                : " + gzipEnabled + "\n";
-    currentSettings += "Class Regex                : " + Arrays.toString(classRegex) + "\n";
-    currentSettings += "Exclude Class Regex        : " + Arrays.toString(excludeClassRegex) + "\n";
+
+    String includeString = "";
+    if (this.classesToInclude != null)
+    	includeString = this.classesToInclude.toString();
+    currentSettings += "Include Class Regex                : " + includeString + "\n";
+
+    String excludeString = "";
+    if (this.classesToExclude != null)
+    	excludeString = this.classesToExclude.toString();
+    currentSettings += "Exclude Class Regex                : " + excludeString + "\n";
+
     currentSettings += "Tracing Enabled            : " + instruEnabled + "\n";
     currentSettings += "Save Traced Class Files    : " + saveTracedClassfiles
                        + "\n";
@@ -210,10 +242,20 @@ public Map<String, String> getSettingsMap()
                     Boolean.toString(instruEnabled));
     settingsMap.put(AgentConfigConstants.GZIP,
             Boolean.toString(gzipEnabled));
+
+    String includeSettings = "";
+    if (this.classesToInclude!=null) {
+    	includeSettings = this.classesToInclude.toString();
+    }
     settingsMap.put(AgentConfigConstants.CLASS_REGEX, 
-                    getPatternString(classRegex));
+                    includeSettings);
+
+    String excludeSettings = "";
+    if (this.classesToExclude!=null) {
+    	includeSettings = this.classesToExclude.toString();
+    }
     settingsMap.put(AgentConfigConstants.EXCLUDE_CLASS_REGEX,
-                    getPatternString(excludeClassRegex));
+                    excludeSettings);
     settingsMap.put(AgentConfigConstants.VERBOSE_MODE,
                     Boolean.toString(verboseMode));
     settingsMap.put(AgentConfigConstants.SAVE_TRACED_CLASSFILES,
@@ -222,18 +264,13 @@ public Map<String, String> getSettingsMap()
     settingsMap.put(AgentConfigConstants.START_WAIT, Boolean.toString(waitStart));
     return settingsMap;
   }
+
+
+	public void logVerbose(String v) {
+	    if (isVerboseMode())
+	    {
+	      TraceHandler.INSTANCE.writeTraceOutput("DEBUG: " + v);
+	    }
+	}
 
-  private String getPatternString(String[] parts)
-  {
-    StringBuilder strBuilder = new StringBuilder();
-    for (int ii = 0; ii < parts.length; ii++)
-    {
-      strBuilder.append(parts[ii]);
-      if (ii < (parts.length - 1))
-      {
-        strBuilder.append("|");
-      }
-    }
-    return strBuilder.toString();
-  }
 }

org.intrace/src/org/intrace/agent/ClassTransformer.java

@@ -112,7 +112,8 @@ private byte[] getInstrumentedClassBytes(String xiClassName,
 
       InstrumentedClassWriter writer = new InstrumentedClassWriter(xiClassName,
                                                                    cr, analysis,
-                                                                   shouldInstrument);
+                                                                   shouldInstrument,
+                                                                   settings);
       cr.accept(writer, 0);
 
       return writer.toByteArray();
@@ -163,7 +164,7 @@ private boolean isToBeConsideredForInstrumentation(
       return false;
     }
 
-    // Don't sensitive classes
+    // Don't instrument sensitive classes
     if (isSensitiveClass(className))
     {
       if (settings.isVerboseMode())
@@ -183,10 +184,9 @@ private boolean isToBeConsideredForInstrumentation(
       return false;
     }
 
-    // Don't modify classes which match the exclude regex
-    if ((settings.getExcludeClassRegex() == null)
-        || matches(settings.getExcludeClassRegex(), className))
-    {
+
+    if (this.settings.getClassesToExclude() != null && 
+    		this.settings.getClassesToExclude().allMethodsSpecified(className)) {
       if (settings.isVerboseMode())
       {
         TraceHandler.INSTANCE.writeTraceOutput("DEBUG: Ignoring class matching the active exclude regex: "
@@ -706,7 +706,7 @@ public void instrumentKlasses(Set<ComparableClass> klasses)
         catch (Throwable e)
         {
           // Write exception to stdout
-//          System.out.println(klass.klass.getName());
+          System.err.println("Exception [" + e.getMessage() + "] instrumenting [" + klass.klass.getName() + "]");
           e.printStackTrace();
         }
       }