Package structure flattened

.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 	<classpathentry kind="src" output="output/build/disl" path="src-disl"/>
-	<classpathentry kind="src" output="output/build/shvm" path="src-shvm"/>
 	<classpathentry kind="src" output="output/build/util" path="src-util"/>
 	<classpathentry kind="src" output="output/build/test" path="src-test"/>
 	<classpathentry kind="src" output="output/build/shvm-dispatch" path="src-shvm-dispatch"/>
@@ -25,6 +24,22 @@
 	<classpathentry kind="src" path="disl/src/src-annotation"/>
 	<classpathentry kind="src" path="disl/src/src-context"/>
 	<classpathentry kind="src" path="disl/src-test"/>
+	<classpathentry kind="src" path="shvm/src/src-dislreserver"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-analyze"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-close"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-classinfo"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-newclass"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-objfree"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-reganalysis"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-instr"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-stringinfo"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-threadend"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-threadinfo"/>
+	<classpathentry kind="src" path="shvm/src/src-msg-analyze-mtdispatch"/>
+	<classpathentry kind="src" path="shvm/src/src-remoteanalysis"/>
+	<classpathentry kind="src" path="shvm/src/src-reqdispatch"/>
+	<classpathentry kind="src" path="shvm/src/src-shadow"/>
+	<classpathentry kind="src" path="shvm/src/src-util"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="output/lib/disl-bypass.jar"/>
 	<classpathentry kind="lib" path="lib/disl/log4j.jar" sourcepath="lib/devel/log4j-source.jar"/>

build.properties

@@ -18,7 +18,7 @@ src.examples=examples
 disl.bypass.lib=disl-bypass.jar
 disl.agent.lib.base=dislagent
 
-shvm.lib=dislre-server.jar
+
 shvm.dispatch.lib=dislre-dispatch.jar
 shvm.agent.lib.base=dislreagent
 

build.xml

@@ -634,7 +634,24 @@
 
 	<target name="compile-shvm" depends="compile-util,compile-shvm-dispatch">
 		<mkdir dir="${build.shvm}"/>
-		<javac destdir="${build.shvm}" srcdir="${src.shvm}" debug="true">
+		<javac destdir="${build.shvm}" debug="true">
+			<src path="shvm/src/src-dislreserver" />
+			<src path="shvm/src/src-msg-analyze" />
+			<src path="shvm/src/src-msg-analyze-mtdispatch" />
+			<src path="shvm/src/src-msg-classinfo" />
+			<src path="shvm/src/src-msg-close" />
+			<src path="shvm/src/src-msg-instr" />
+			<src path="shvm/src/src-msg-newclass" />
+			<src path="shvm/src/src-msg-objfree" />
+			<src path="shvm/src/src-msg-reganalysis" />
+			<src path="shvm/src/src-msg-stringinfo" />
+			<src path="shvm/src/src-msg-threadend" />
+			<src path="shvm/src/src-msg-threadinfo" />
+			<src path="shvm/src/src-remoteanalysis" />
+			<src path="shvm/src/src-reqdispatch" />
+			<src path="shvm/src/src-shadow" />
+			<src path="shvm/src/src-util" />
+
 			<classpath refid="util.classpath"/>
 			<classpath refid="asm.classpath"/>
 		</javac>

common.properties

@@ -18,8 +18,10 @@ build.ivy.file = dependencies.xml
 src.bin=bin
 src.disl.prefix=disl
 src.disl-server.prefix=disl-server
+src.shvm.prefix=shvm
 
 disl.lib=disl-server.jar
+shvm.lib=dislre-server.jar
 
 # Base output directory
 out.dir=output

shvm/.gitignore

+output

shvm/README.md

+# Shadow VM server

shvm/build.properties

+# Build properties related to the SHVM package
+

shvm/build.xml

+<project name="disl-server" default="build" basedir=".">
+
+    <!--
+     Import required property files.
+     -->
+    <property file="../common.properties"/>
+    <property file="build.properties" />
+    <property file="../disl.version.properties" />
+
+    <!--
+    Initialize the build directory
+    -->
+    <target name="init">
+        <mkdir dir="${build.shvm}" />
+    </target>
+
+    <!--
+    Dependency class paths
+    -->
+    <path id="asm.classpath">
+        <fileset dir="../${lib.disl.dir}" includes="asm*.jar" id="asm.fileset"/>
+    </path>
+    <path id="util.classpath">
+        <pathelement location="../${build.util}"/>
+    </path>
+
+    <path id="protobuf.classpath">
+        <fileset dir="../${lib.disl.dir}" includes="protobuf*.jar"/>
+    </path>
+
+    <!--
+    Refer to the parent targets
+    -->
+    <target name="compile-util">
+        <ant antfile="../build.xml" target="compile-util" usenativebasedir="true" />
+    </target>
+
+    <target name="compile-shvm-dispatch">
+        <ant antfile="../build.xml" target="compile-shvm-dispatch" usenativebasedir="true" />
+    </target>
+
+    <target name="build-shvm-dispatch">
+        <ant antfile="../build.xml" target="build-shvm-dispatch" usenativebasedir="true" />
+    </target>
+
+    <!-- SHVM Server -->
+    <target name="compile" depends="compile-util,compile-shvm-dispatch,init">
+        <javac destdir="${build.shvm}" debug="true">
+
+            <src path="src/src-dislreserver" />
+            <src path="src/src-msg-analyze" />
+            <src path="src/src-msg-analyze-mtdispatch" />
+            <src path="src/src-msg-classinfo" />
+            <src path="src/src-msg-close" />
+            <src path="src/src-msg-instr" />
+            <src path="src/src-msg-newclass" />
+            <src path="src/src-msg-objfree" />
+            <src path="src/src-msg-reganalysis" />
+            <src path="src/src-msg-stringinfo" />
+            <src path="src/src-msg-threadend" />
+            <src path="src/src-msg-threadinfo" />
+            <src path="src/src-remoteanalysis" />
+            <src path="src/src-reqdispatch" />
+            <src path="src/src-shadow" />
+            <src path="src/src-util" />
+
+            <classpath>
+                <path path="../${src.shvm.prefix}/${build.shvm}" />
+                <path refid="util.classpath"/>
+                <path refid="asm.classpath" />
+                <path refid="protobuf.classpath"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <!-- Get ASM libs from ASM class path. -->
+    <pathconvert pathsep=" " property="asm.libs" refid="asm.classpath">
+        <mapper type="flatten"/>
+    </pathconvert>
+
+    <!-- Get ProtoBuf Java libs from ProtoBuf class path. -->
+    <pathconvert pathsep=" " property="protobuf.libs" refid="protobuf.classpath">
+        <mapper type="flatten"/>
+    </pathconvert>
+
+    <target name="build" depends="compile, build-shvm-dispatch">
+
+        <jar destfile="${out.lib}/${shvm.lib}">
+            <manifest>
+                <attribute name="Class-Path" value="${asm.libs} ${protobuf.libs}"/>
+                <attribute name="Main-Class" value="ch.usi.dag.dislreserver.DiSLREServer"/>
+                <attribute name="DiSL-Version" value="${disl.version}"/>
+            </manifest>
+
+            <service type="javax.annotation.processing.Processor" provider="ch.usi.dag.disl.DislClassFinder"/>
+
+            <fileset dir="${build.shvm}" />
+            <fileset dir="../${build.util}"/>
+        </jar>
+    </target>
+
+    <!--
+    Clean the build directory
+    -->
+    <target name="clean">
+        <delete dir="output" />
+    </target>
+
+</project>

src-shvm/ch/usi/dag/dislreserver/DiSLREServer.java → shvm/src/src-dislreserver/ch/usi/dag/dislreserver/DiSLREServer.java

@@ -17,8 +17,6 @@ import java.nio.channels.ClosedByInterruptException;
 import java.nio.channels.ServerSocketChannel;
 import java.nio.channels.SocketChannel;
 
-import ch.usi.dag.dislreserver.reqdispatch.RequestDispatcher;
-import ch.usi.dag.dislreserver.util.Logging;
 import ch.usi.dag.util.logging.Logger;
 
 

src-shvm/ch/usi/dag/dislreserver/msg/analyze/mtdispatch/ATEManager.java → shvm/src/src-msg-analyze-mtdispatch/ch/usi/dag/dislreserver/ATEManager.java

-package ch.usi.dag.dislreserver.msg.analyze.mtdispatch;
+package ch.usi.dag.dislreserver;
 
 import java.util.Collections;
 import java.util.concurrent.BlockingQueue;
@@ -6,7 +6,6 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import ch.usi.dag.dislreserver.DiSLREServerFatalException;
 
 /**
  * Manages executors

src-shvm/ch/usi/dag/dislreserver/msg/analyze/mtdispatch/AnalysisDispatcher.java → shvm/src/src-msg-analyze-mtdispatch/ch/usi/dag/dislreserver/AnalysisDispatcher.java

-package ch.usi.dag.dislreserver.msg.analyze.mtdispatch;
+package ch.usi.dag.dislreserver;
 
 import java.util.List;
 
-import ch.usi.dag.dislreserver.DiSLREServerFatalException;
-import ch.usi.dag.dislreserver.msg.analyze.AnalysisInvocation;
 
 // Each thread has dedicated queue where new tasks are submitted.
 public class AnalysisDispatcher {

src-shvm/ch/usi/dag/dislreserver/msg/analyze/mtdispatch/AnalysisTask.java → shvm/src/src-msg-analyze-mtdispatch/ch/usi/dag/dislreserver/AnalysisTask.java

-package ch.usi.dag.dislreserver.msg.analyze.mtdispatch;
+package ch.usi.dag.dislreserver;
 
 import java.util.List;
 
-import ch.usi.dag.dislreserver.msg.analyze.AnalysisInvocation;
+import ch.usi.dag.dislreserver.AnalysisInvocation;
 
 /**
  *  Holds unprocessed task data for some thread
@@ -37,4 +37,4 @@ class AnalysisTask {
     public long getEpoch() {
         return epoch;
     }
-}
+}
\ No newline at end of file

src-shvm/ch/usi/dag/dislreserver/msg/analyze/mtdispatch/AnalysisTaskExecutor.java → shvm/src/src-msg-analyze-mtdispatch/ch/usi/dag/dislreserver/AnalysisTaskExecutor.java

-package ch.usi.dag.dislreserver.msg.analyze.mtdispatch;
+package ch.usi.dag.dislreserver;
 
 import java.util.LinkedList;
 import java.util.Queue;

src-shvm/ch/usi/dag/dislreserver/msg/analyze/mtdispatch/AnalysisThread.java → shvm/src/src-msg-analyze-mtdispatch/ch/usi/dag/dislreserver/AnalysisThread.java

-package ch.usi.dag.dislreserver.msg.analyze.mtdispatch;
-
-import ch.usi.dag.dislreserver.DiSLREServerFatalException;
-import ch.usi.dag.dislreserver.msg.analyze.AnalysisInvocation;
+package ch.usi.dag.dislreserver;
 
 /**
  * Thread processing analysis tasks
@@ -38,4 +35,4 @@ class AnalysisThread extends Thread {
         }
     }
 
-}
+}
\ No newline at end of file

src-shvm/ch/usi/dag/dislreserver/msg/analyze/mtdispatch/ObjectFreeTask.java → shvm/src/src-msg-analyze-mtdispatch/ch/usi/dag/dislreserver/ObjectFreeTask.java

-package ch.usi.dag.dislreserver.msg.analyze.mtdispatch;
+package ch.usi.dag.dislreserver;
 
 class ObjectFreeTask {
 

src-shvm/ch/usi/dag/dislreserver/msg/analyze/mtdispatch/ObjectFreeTaskExecutor.java → shvm/src/src-msg-analyze-mtdispatch/ch/usi/dag/dislreserver/ObjectFreeTaskExecutor.java

-package ch.usi.dag.dislreserver.msg.analyze.mtdispatch;
+package ch.usi.dag.dislreserver;
 
 import java.util.Set;
 import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import ch.usi.dag.dislreserver.DiSLREServerFatalException;
-import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver;
-import ch.usi.dag.dislreserver.remoteanalysis.RemoteAnalysis;
-import ch.usi.dag.dislreserver.shadow.ShadowObject;
-import ch.usi.dag.dislreserver.shadow.ShadowObjectTable;
 
 class ObjectFreeTaskExecutor extends Thread {
 

src-shvm/ch/usi/dag/dislreserver/msg/analyze/AnalysisHandler.java → shvm/src/src-msg-analyze/ch/usi/dag/dislreserver/AnalysisHandler.java

-package ch.usi.dag.dislreserver.msg.analyze;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -7,12 +7,7 @@ import java.lang.reflect.Method;
 import java.util.LinkedList;
 import java.util.List;
 
-import ch.usi.dag.dislreserver.DiSLREServerException;
-import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver.AnalysisMethodHolder;
-import ch.usi.dag.dislreserver.msg.analyze.mtdispatch.AnalysisDispatcher;
-import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
-import ch.usi.dag.dislreserver.shadow.ShadowObject;
-import ch.usi.dag.dislreserver.shadow.ShadowObjectTable;
+import ch.usi.dag.dislreserver.AnalysisResolver.AnalysisMethodHolder;
 
 
 public final class AnalysisHandler implements RequestHandler {

src-shvm/ch/usi/dag/dislreserver/msg/analyze/AnalysisInvocation.java → shvm/src/src-msg-analyze/ch/usi/dag/dislreserver/AnalysisInvocation.java

-package ch.usi.dag.dislreserver.msg.analyze;
+package ch.usi.dag.dislreserver;
 
 import java.lang.reflect.Method;
 

src-shvm/ch/usi/dag/dislreserver/msg/analyze/AnalysisResolver.java → shvm/src/src-msg-analyze/ch/usi/dag/dislreserver/AnalysisResolver.java

-package ch.usi.dag.dislreserver.msg.analyze;
+package ch.usi.dag.dislreserver;
 
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -8,9 +8,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import ch.usi.dag.dislreserver.DiSLREServerException;
-import ch.usi.dag.dislreserver.DiSLREServerFatalException;
-import ch.usi.dag.dislreserver.remoteanalysis.RemoteAnalysis;
 
 public final class AnalysisResolver {
     private static final String METHOD_DELIM = ".";

src-shvm/ch/usi/dag/dislreserver/msg/classinfo/ClassInfoHandler.java → shvm/src/src-msg-classinfo/ch/usi/dag/dislreserver/ClassInfoHandler.java

-package ch.usi.dag.dislreserver.msg.classinfo;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import ch.usi.dag.dislreserver.DiSLREServerException;
-import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
-import ch.usi.dag.dislreserver.shadow.ShadowClassTable;
-
 
 public final class ClassInfoHandler implements RequestHandler {
 

src-shvm/ch/usi/dag/dislreserver/msg/close/CloseHandler.java → shvm/src/src-msg-close/ch/usi/dag/dislreserver/CloseHandler.java

-package ch.usi.dag.dislreserver.msg.close;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 
-import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver;
-import ch.usi.dag.dislreserver.remoteanalysis.RemoteAnalysis;
-import ch.usi.dag.dislreserver.reqdispatch.RequestDispatcher;
-import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
-
 
 public final class CloseHandler implements RequestHandler {
 

src-shvm/ch/usi/dag/dislreserver/msg/instr/AbstractInstrumentation.java → shvm/src/src-msg-instr/ch/usi/dag/dislreserver/AbstractInstrumentation.java

-package ch.usi.dag.dislreserver.msg.instr;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -6,9 +6,8 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
-import ch.usi.dag.dislreserver.DiSLREServerException;
-import ch.usi.dag.dislreserver.msg.instr.InstrMsgReader.InstrClassMessage;
-import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
+import ch.usi.dag.dislreserver.InstrMsgReader.InstrClassMessage;
+
 
 public abstract class AbstractInstrumentation implements RequestHandler {
 

src-shvm/ch/usi/dag/dislreserver/msg/instr/InstrMsgReader.java → shvm/src/src-msg-instr/ch/usi/dag/dislreserver/InstrMsgReader.java

-package ch.usi.dag.dislreserver.msg.instr;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

src-shvm/ch/usi/dag/dislreserver/msg/newclass/NewClassHandler.java → shvm/src/src-msg-newclass/ch/usi/dag/dislreserver/NewClassHandler.java

-package ch.usi.dag.dislreserver.msg.newclass;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import ch.usi.dag.dislreserver.DiSLREServerException;
-import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
-import ch.usi.dag.dislreserver.shadow.ShadowClassTable;
-
 
 public class NewClassHandler implements RequestHandler {
 

src-shvm/ch/usi/dag/dislreserver/msg/objfree/ObjectFreeHandler.java → shvm/src/src-msg-objfree/ch/usi/dag/dislreserver/ObjectFreeHandler.java

-package ch.usi.dag.dislreserver.msg.objfree;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import ch.usi.dag.dislreserver.DiSLREServerException;
-import ch.usi.dag.dislreserver.msg.analyze.AnalysisHandler;
-import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
 
 public class ObjectFreeHandler implements RequestHandler {
 

src-shvm/ch/usi/dag/dislreserver/msg/reganalysis/RegAnalysisHandler.java → shvm/src/src-msg-reganalysis/ch/usi/dag/dislreserver/RegAnalysisHandler.java

-package ch.usi.dag.dislreserver.msg.reganalysis;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import ch.usi.dag.dislreserver.DiSLREServerException;
-import ch.usi.dag.dislreserver.msg.analyze.AnalysisResolver;
-import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
 
 public final class RegAnalysisHandler implements RequestHandler {
 

src-shvm/ch/usi/dag/dislreserver/msg/stringinfo/StringInfoHandler.java → shvm/src/src-msg-stringinfo/ch/usi/dag/dislreserver/StringInfoHandler.java

-package ch.usi.dag.dislreserver.msg.stringinfo;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import ch.usi.dag.dislreserver.DiSLREServerException;
-import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
-import ch.usi.dag.dislreserver.shadow.ShadowObjectTable;
-
 
 public final class StringInfoHandler implements RequestHandler {
 

src-shvm/ch/usi/dag/dislreserver/msg/threadend/ThreadEndHandler.java → shvm/src/src-msg-threadend/ch/usi/dag/dislreserver/ThreadEndHandler.java

-package ch.usi.dag.dislreserver.msg.threadend;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import ch.usi.dag.dislreserver.DiSLREServerException;
-import ch.usi.dag.dislreserver.msg.analyze.AnalysisHandler;
-import ch.usi.dag.dislreserver.reqdispatch.RequestHandler;
 
 public class ThreadEndHandler implements RequestHandler {
 

src-shvm/ch/usi/dag/dislreserver/msg/threadinfo/ThreadInfoHandler.java → shvm/src/src-msg-threadinfo/ch/usi/dag/dislreserver/ThreadInfoHandler.java

-package ch.usi.dag.dislreserver.msg.threadinfo;
+package ch.usi.dag.dislreserver;
 
 import java.io.DataInputStream;