Refactor transform.

Hesey · Jun 19, 2012 · 58a2438 · 58a2438
1 parent 7f9a2ea
commit 58a2438
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/main/scala/com/github/zhongl/housemd/command/Inspect.java b/src/main/scala/com/github/zhongl/housemd/command/Inspect.java
@@ -11,8 +11,10 @@
  * @author <a href="mailto:[email protected]">zhongl<a>
  */
 public class Inspect extends TransformCommand {
+
+
     public Inspect(Instrumentation inst, PrintOut out) {
-        super("", "", inst, out);
+        super("inspect", "display fields of a class.", inst, out);
     }
 
     @Override

diff --git a/src/main/scala/com/github/zhongl/housemd/command/Trace.scala b/src/main/scala/com/github/zhongl/housemd/command/Trace.scala
@@ -113,7 +113,8 @@ class Trace(val inst: Instrumentation, out: PrintOut)
     override def heartbeat(now: Long) {
       if (now - last >= intervalMillis) {
         last = now
-        statistics foreach { s => println(s.reps(maxMethodSignLength, maxClassLoaderLength)) }
+        if (statistics.isEmpty) println("No traced method invoked")
+        else statistics foreach { s => println(s.reps(maxMethodSignLength, maxClassLoaderLength)) }
         println()
       }
     }

diff --git a/src/main/scala/com/github/zhongl/housemd/instrument/Transform.scala b/src/main/scala/com/github/zhongl/housemd/instrument/Transform.scala
@@ -42,14 +42,18 @@ class Transform extends ((Instrumentation, Filter, Seconds, Int, Loggable, Hook)
 
       @inline
       def isNotFromHouseMD = if (c.getName.startsWith("com.github.zhongl.housemd")) {
-        log.warn("Skip " + c + " from HouseMD")
+        log.warn("Skip " + c + " belongs to HouseMD")
         false
       } else true
 
       @inline
       def isNotInterface = if (c.isInterface) {log.warn("Skip " + c); false} else true
 
-      filter(c) && isNotFromHouseMD && isNotInterface
+      @inline
+      def isNotFromBootClassLoader =
+        if (isFromBootClassLoader(c)) {log.warn("Skip " + c + " loaded from bootclassloader"); false} else true
+
+      filter(c) && isNotFromHouseMD && isNotInterface && isNotFromBootClassLoader
     }
 
     if (candidates.isEmpty) {

diff --git a/src/test/scala/com/github/zhongl/housemd/command/TransformCommandSpec.scala b/src/test/scala/com/github/zhongl/housemd/command/TransformCommandSpec.scala
@@ -112,9 +112,9 @@ class TransformCommandSpec extends FunSpec with ShouldMatchers with AdviceReflec
       }
     }
 
-    ignore("should not probe class loaded by boot classloader") {
+    it("should not probe class loaded by boot classloader") {
       parseAndRun("String") { out =>
-        out.split("\n").head should be("WARN : Skip " + classOf[String] + " loaded from bootclassloader.")
+        out.split("\n").head should be("WARN : Skip " + classOf[String] + " loaded from bootclassloader")
       }
     }