Merge remote-tracking branch 'upstream/master'

Author: sitdh

.gitignore

@@ -11,3 +11,7 @@ bin/
 .project
 .settings/
 
+# intellij
+.idea/
+*.iml
+

README.md

@@ -12,11 +12,11 @@ A suite of programs for generating static and dynamic call graphs in Java.
 
 #### Compile
 
-The java-callgraph package is build with maven. Install maven and do: 
+The java-callgraph package is build with maven. Install maven and do:
 
-<code>
+```
 mvn install
-</code>
+```
 
 This will produce a `target` directory with the following three jars:
 - javacg-0.1-SNAPSHOT.jar: This is the standard maven packaged jar with static and dynamic call graph generator classes
@@ -31,39 +31,42 @@ Instructions for running the callgraph generators
 
 `javacg-static` accepts as arguments the jars to analyze.
 
-<code>
+```
 java -jar javacg-0.1-SNAPSHOT-static.jar lib1.jar lib2.jar...
-</code>
+```
 
 `javacg-static` produces combined output in the following format:
 
 ###### For methods
 
-<code>
-  M:class1:<method1> (typeofcall)class2:<method2>
-</code>
+```
+  M:class1:<method1>(arg_types) (typeofcall)class2:<method2>(arg_types)
+```
 
 The line means that `method1` of `class1` called `method2` of `class2`.
 The type of call can have one of the following values (refer to
-the [JVM specification](http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc6.html) 
-for the meaning of the calls): 
+the [JVM specification](http://java.sun.com/docs/books/jvms/second_edition/html/Instructions2.doc6.html)
+for the meaning of the calls):
 
  * `M` for `invokevirtual` calls
  * `I` for `invokeinterface` calls
  * `O` for `invokespecial` calls
  * `S` for `invokestatic` calls
+ * `D` for `invokedynamic` calls
+
+For `invokedynamic` calls, it is not possible to infer the argument types.
 
 ###### For classes
 
-<code>
+```
   C:class1 class2
-</code>
+```
 
 This means that some method(s) in `class1` called some method(s) in `class2`.
 
 ##### Dynamic
 
-`javacg-dynamic` uses 
+`javacg-dynamic` uses
 [javassist](http://www.csg.is.titech.ac.jp/~chiba/javassist/) to insert probes
 at method entry and exit points. To be able to analyze a class `javassist` must
 resolve all dependent classes at instrumentation time. To do so, it reads
@@ -81,7 +84,9 @@ entries), `javacg-dynamic` includes support for restricting the set of classes
 to be instrumented through include and exclude statements. The options are
 appended to the `-javaagent` argument and has the following format
 
-<code>-javaagent:javacg-dycg-agent.jar="incl=mylib.*,mylib2.*,java.nio.*;excl=java.nio.charset.*"</code>
+```
+-javaagent:javacg-dycg-agent.jar="incl=mylib.*,mylib2.*,java.nio.*;excl=java.nio.charset.*"
+```
 
 The example above will instrument all classes under the the `mylib`, `mylib2` and
 `java.nio` namespaces, except those that fall under the `java.nio.charset` namespace.
@@ -90,7 +95,7 @@ The example above will instrument all classes under the the `mylib`, `mylib2` an
 java
 -Xbootclasspath:/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar:mylib.jar
 -javaagent:javacg-0.1-SNAPSHOT-dycg-agent.jar="incl=mylib.*;"
--classpath mylib.jar mylib.Mainclass 
+-classpath mylib.jar mylib.Mainclass
 ```
 
 `javacg-dynamic` produces two kinds of output. On the standard output, it
@@ -110,16 +115,16 @@ a poor man's profiler. The format is the following:
 
 The output line starts with a `<` or `>` depending on whether it is a method
 entry or exit. It then writes the stack depth, thread id and the class and
-method name, followed by a timestamp. The provided `process_trace.rb` 
+method name, followed by a timestamp. The provided `process_trace.rb`
 script processes the callgraph output to generate total time per method
-information. 
+information.
 
 #### Examples
 
-The following examples instrument the 
-[Dacapo benchmark suite](http://dacapobench.org/) to produce dynamic call graphs. 
+The following examples instrument the
+[Dacapo benchmark suite](http://dacapobench.org/) to produce dynamic call graphs.
 The Dacapo benchmarks come in a single big jar archive that contains all dependency
-libraries. To build the boot class path required for the javacg-dyn program, 
+libraries. To build the boot class path required for the javacg-dyn program,
 extract the `dacapo.jar` to a directory: all the required libraries can be found
 in the `jar` directory.
 
@@ -167,7 +172,7 @@ org.apache.lucene.analysis.Token:termLength org.apache.lucene.analysis.Token:ini
 
 * The static call graph generator does not account for methods invoked via
   reflection.
-* The dynamic call graph generator will not work reliably (or at all) for 
+* The dynamic call graph generator will not work reliably (or at all) for
   multithreaded programs
 * The dynamic call graph generator does not handle exceptions very well, so some
 methods might appear as having never returned
@@ -179,4 +184,3 @@ Georgios Gousios <gousiosg@gmail.com>
 #### License
 
 [2-clause BSD](http://www.opensource.org/licenses/bsd-license.php)
-

pom.xml

@@ -17,7 +17,7 @@
     <dependency>
       <groupId>org.apache.bcel</groupId>
       <artifactId>bcel</artifactId>
-      <version>5.2</version>
+      <version>6.0</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -32,7 +32,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2.1</version>
+        <version>3.0.0</version>
         <configuration>
           <descriptors>
             <descriptor>assembly-dyn.xml</descriptor>
@@ -58,11 +58,11 @@
       </plugin>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
+        <version>3.6.1</version>
         <configuration>
           <optimize>false</optimize>
-          <source>1.6</source>
-          <target>1.6</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
     </plugins>

src/main/java/gr/gousiosg/javacg/dyn/Instrumenter.java

@@ -46,8 +46,8 @@
 
 public class Instrumenter implements ClassFileTransformer {
 
-    static List<Pattern> pkgIncl = new ArrayList<Pattern>();
-    static List<Pattern> pkgExcl = new ArrayList<Pattern>();
+    static List<Pattern> pkgIncl = new ArrayList<>();
+    static List<Pattern> pkgExcl = new ArrayList<>();
 
     public static void premain(String argument, Instrumentation instrumentation) {
 
@@ -63,14 +63,14 @@ public static void premain(String argument, Instrumentation instrumentation) {
         String[] tokens = argument.split(";");
 
         if (tokens.length < 1) {
-            err("Missing delimeter ;");
+            err("Missing delimiter ;");
             return;
         }
 
         for (String token : tokens) {
             String[] args = token.split("=");
             if (args.length < 2) {
-                err("Missing argument delimeter =:" + token);
+                err("Missing argument delimiter =:" + token);
                 return;
             }
 
@@ -118,7 +118,7 @@ public byte[] transform(ClassLoader loader, String className, Class clazz,
         for (Pattern p : pkgExcl) {
             Matcher m = p.matcher(name);
             if (m.matches()) {
-                err("Not enhansing class: " + name);
+                err("Skipping class: " + name);
                 enhanceClass = false;
                 break;
             }

src/main/java/gr/gousiosg/javacg/dyn/MethodStack.java

@@ -33,40 +33,36 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Stack;
 
 public class MethodStack {
 
-    private static Stack<String> stack = new Stack<String>();
-    private static Map<Pair<String, String>, Integer> callgraph = new HashMap<Pair<String,String>, Integer>();
+    private static Stack<String> stack = new Stack<>();
+    private static Map<Pair<String, String>, Integer> callgraph = new HashMap<>();
     static FileWriter fw; 
     static StringBuffer sb;
     static long threadid = -1L;
-    
+
     static {
         Runtime.getRuntime().addShutdownHook(new Thread() {
             public void run() {
                 try {
                     fw.close();
                 } catch (IOException e) {
-                    // TODO Auto-generated catch block
                     e.printStackTrace();
                 }
                 //Sort by number of calls
-                List<Pair<String, String>> keys = new ArrayList<Pair<String, String>>();
+                List<Pair<String, String>> keys = new ArrayList<>();
                 keys.addAll(callgraph.keySet());
-                Collections.sort(keys, new Comparator<Object>() {
-                    public int compare(Object o1, Object o2) {
-                        Integer v1 = callgraph.get(o1);
-                        Integer v2 = callgraph.get(o2);
-                        return v1.compareTo(v2);
-                    }
+                Collections.sort(keys, (o1, o2) -> {
+                    Integer v1 = callgraph.get(o1);
+                    Integer v2 = callgraph.get(o2);
+                    return v1.compareTo(v2);
                 });
-                
+
                 for (Pair<String, String> key : keys) {
                     System.out.println(key + " " + callgraph.get(key));
                 }
@@ -91,7 +87,7 @@ public static void push(String callname, Object [] argM) throws IOException {//
             return;
 
         if (!stack.isEmpty()) {
-            Pair<String, String> p = new Pair<String, String>(stack.peek(), callname); 
+            Pair<String, String> p = new Pair<>(stack.peek(), callname);
             if (callgraph.containsKey(p))
                 callgraph.put(p, callgraph.get(p) + 1);
             else

src/main/java/gr/gousiosg/javacg/stat/MethodVisitor.java

@@ -29,18 +29,7 @@
 package gr.gousiosg.javacg.stat;
 
 import org.apache.bcel.classfile.JavaClass;
-import org.apache.bcel.generic.ConstantPoolGen;
-import org.apache.bcel.generic.ConstantPushInstruction;
-import org.apache.bcel.generic.EmptyVisitor;
-import org.apache.bcel.generic.INVOKEINTERFACE;
-import org.apache.bcel.generic.INVOKESPECIAL;
-import org.apache.bcel.generic.INVOKESTATIC;
-import org.apache.bcel.generic.INVOKEVIRTUAL;
-import org.apache.bcel.generic.Instruction;
-import org.apache.bcel.generic.InstructionConstants;
-import org.apache.bcel.generic.InstructionHandle;
-import org.apache.bcel.generic.MethodGen;
-import org.apache.bcel.generic.ReturnInstruction;
+import org.apache.bcel.generic.*;
 
 /**
  * The simplest of method visitors, prints any invoked method
@@ -59,8 +48,19 @@ public MethodVisitor(MethodGen m, JavaClass jc) {
         visitedClass = jc;
         mg = m;
         cp = mg.getConstantPool();
-        format = "M:" + visitedClass.getClassName() + ":" + mg.getName() 
-            + " " + "(%s)%s:%s";
+        format = "M:" + visitedClass.getClassName() + ":" + mg.getName() + "(" + argumentList(mg.getArgumentTypes()) + ")"
+            + " " + "(%s)%s:%s(%s)";
+    }
+
+    private String argumentList(Type[] arguments) {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < arguments.length; i++) {
+            if (i != 0) {
+                sb.append(",");
+            }
+            sb.append(arguments[i].toString());
+        }
+        return sb.toString();
     }
 
     public void start() {
@@ -77,29 +77,34 @@ public void start() {
 
     private boolean visitInstruction(Instruction i) {
         short opcode = i.getOpcode();
-
-        return ((InstructionConstants.INSTRUCTIONS[opcode] != null)
+        return ((InstructionConst.getInstruction(opcode) != null)
                 && !(i instanceof ConstantPushInstruction) 
                 && !(i instanceof ReturnInstruction));
     }
 
     @Override
     public void visitINVOKEVIRTUAL(INVOKEVIRTUAL i) {
-        System.out.println(String.format(format,"M",i.getReferenceType(cp),i.getMethodName(cp)));
+        System.out.println(String.format(format,"M",i.getReferenceType(cp),i.getMethodName(cp),argumentList(i.getArgumentTypes(cp))));
     }
 
     @Override
     public void visitINVOKEINTERFACE(INVOKEINTERFACE i) {
-        System.out.println(String.format(format,"I",i.getReferenceType(cp),i.getMethodName(cp)));
+        System.out.println(String.format(format,"I",i.getReferenceType(cp),i.getMethodName(cp),argumentList(i.getArgumentTypes(cp))));
     }
 
     @Override
     public void visitINVOKESPECIAL(INVOKESPECIAL i) {
-        System.out.println(String.format(format,"O",i.getReferenceType(cp),i.getMethodName(cp)));
+        System.out.println(String.format(format,"O",i.getReferenceType(cp),i.getMethodName(cp),argumentList(i.getArgumentTypes(cp))));
     }
 
     @Override
     public void visitINVOKESTATIC(INVOKESTATIC i) {
-        System.out.println(String.format(format,"S",i.getReferenceType(cp),i.getMethodName(cp)));
+        System.out.println(String.format(format,"S",i.getReferenceType(cp),i.getMethodName(cp),argumentList(i.getArgumentTypes(cp))));
+    }
+
+    @Override
+    public void visitINVOKEDYNAMIC(INVOKEDYNAMIC i) {
+        System.out.println(String.format(format,"D",i.getType(cp),i.getMethodName(cp),
+                argumentList(i.getArgumentTypes(cp))));
     }
 }