Examples adapted to session support

bin/disl.py

@@ -424,7 +424,7 @@ def run_server(args, parser):
 
 	s_cmd = ["java"]
 	s_cmd+= args.s_opts
-	s_cmd+= ["-cp", args.instrumentation + ":" + s_jar]
+	s_cmd+= ["-cp", args.instrumentation + ":" + s_jar + ":" + args.disl_home+"/lib/dislre-server.jar"]
 	s_cmd+= [s_class]
 	s_cmd+= args.s_args
 
@@ -484,7 +484,7 @@ def run_client(args, parser):
 
 	c_cmd = ["java"]
 	c_cmd+= args.c_opts
-	c_cmd+= ["-agentpath:"+cagent]
+	c_cmd+= ["-agentpath:"+cagent+"="+args.instrumentation]
 	
 	if args.cse == True:
 		c_cmd+= ["-agentpath:"+eagent]

examples/dispatch/src-inst/CodeLengthSC.java

 import org.objectweb.asm.tree.AbstractInsnNode;
 
-import ch.usi.dag.disl.staticcontext.AbstractStaticContext;
+import ch.usi.dag.disl.AbstractStaticContext;
 
 public class CodeLengthSC extends AbstractStaticContext {
 

examples/dispatch/src-inst/DiSLClass.java

 import java.util.LinkedList;
 
-import ch.usi.dag.disl.annotation.After;
-import ch.usi.dag.disl.marker.BasicBlockMarker;
-import ch.usi.dag.disl.marker.BodyMarker;
+import ch.usi.dag.disl.After;
+import ch.usi.dag.disl.BasicBlockMarker;
+import ch.usi.dag.disl.BodyMarker;
 
 public class DiSLClass {
 

examples/dynamic/src-inst/DiSLClass.java

-import ch.usi.dag.disl.annotation.After;
-import ch.usi.dag.disl.dynamiccontext.DynamicContext;
-import ch.usi.dag.disl.marker.BodyMarker;
+import ch.usi.dag.disl.After;
+import ch.usi.dag.disl.DynamicContext;
+import ch.usi.dag.disl.BodyMarker;
 
 public class DiSLClass {
 

examples/guard/src-inst/DiSLClass.java

-import ch.usi.dag.disl.annotation.After;
-import ch.usi.dag.disl.annotation.AfterReturning;
-import ch.usi.dag.disl.annotation.Before;
+import ch.usi.dag.disl.After;
+import ch.usi.dag.disl.AfterReturning;
+import ch.usi.dag.disl.Before;
 
 public class DiSLClass {
 

examples/guard/src-inst/GuardNo.java

-import ch.usi.dag.disl.annotation.GuardMethod;
+import ch.usi.dag.disl.GuardMethod;
 
 public abstract class GuardNo {
 

examples/guard/src-inst/GuardYes.java

-import ch.usi.dag.disl.annotation.GuardMethod;
+import ch.usi.dag.disl.GuardMethod;
 
 public abstract class GuardYes {
 
@@ -6,4 +6,4 @@ public abstract class GuardYes {
 	public static boolean isApplicable() {
 		return true;
 	}
-}
\ No newline at end of file
+}

examples/guard/src-inst/MethodInvocationMarker.java

@@ -6,8 +6,8 @@ import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
-import ch.usi.dag.disl.marker.AbstractMarker;
-import ch.usi.dag.disl.marker.AbstractDWRMarker;
+import ch.usi.dag.disl.AbstractMarker;
+import ch.usi.dag.disl.AbstractDWRMarker;
 
 /**
  * Sets the region on every method invocation instruction.

examples/marker/src-inst/DiSLClass.java

-import ch.usi.dag.disl.annotation.After;
-import ch.usi.dag.disl.annotation.AfterThrowing;
-import ch.usi.dag.disl.annotation.AfterReturning;
-import ch.usi.dag.disl.annotation.Before;
-import ch.usi.dag.disl.marker.BodyMarker;
+import ch.usi.dag.disl.After;
+import ch.usi.dag.disl.AfterThrowing;
+import ch.usi.dag.disl.AfterReturning;
+import ch.usi.dag.disl.Before;
+import ch.usi.dag.disl.BodyMarker;
 
 /**
  * <p>

examples/marker/src-inst/MethodInvocationMarker.java

@@ -6,8 +6,8 @@ import org.objectweb.asm.tree.InsnList;
 import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
-import ch.usi.dag.disl.marker.AbstractMarker;
-import ch.usi.dag.disl.marker.AbstractDWRMarker;
+import ch.usi.dag.disl.AbstractMarker;
+import ch.usi.dag.disl.AbstractDWRMarker;
 
 /**
  * Sets the region on every method invocation instruction.

examples/scope/src-inst/DiSLClass.java

-import ch.usi.dag.disl.annotation.After;
-import ch.usi.dag.disl.annotation.AfterReturning;
-import ch.usi.dag.disl.annotation.Before;
-import ch.usi.dag.disl.marker.BodyMarker;
+import ch.usi.dag.disl.After;
+import ch.usi.dag.disl.AfterReturning;
+import ch.usi.dag.disl.Before;
+import ch.usi.dag.disl.BodyMarker;
 
 public class DiSLClass {
 

examples/smoke/src-inst/DiSLClass.java

-import ch.usi.dag.disl.annotation.After;
-import ch.usi.dag.disl.annotation.AfterReturning;
-import ch.usi.dag.disl.annotation.Before;
-import ch.usi.dag.disl.marker.BodyMarker;
+import ch.usi.dag.disl.After;
+import ch.usi.dag.disl.AfterReturning;
+import ch.usi.dag.disl.Before;
+import ch.usi.dag.disl.BodyMarker;
 
 public class DiSLClass {
 

examples/static/src-inst/DiSLClass.java

-import ch.usi.dag.disl.annotation.After;
-import ch.usi.dag.disl.annotation.Before;
-import ch.usi.dag.disl.marker.BodyMarker;
-import ch.usi.dag.disl.staticcontext.MethodStaticContext;
+import ch.usi.dag.disl.After;
+import ch.usi.dag.disl.Before;
+import ch.usi.dag.disl.BodyMarker;
+import ch.usi.dag.disl.MethodStaticContext;
 
 public class DiSLClass {
 

examples/static/src-inst/DumbLoopContext.java

@@ -2,7 +2,7 @@ import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.InsnList;
 
-import ch.usi.dag.disl.staticcontext.AbstractStaticContext;
+import ch.usi.dag.disl.AbstractStaticContext;
 
 public class DumbLoopContext extends AbstractStaticContext {
 

examples/static/src-inst/DumbLoopGuard.java

-import ch.usi.dag.disl.annotation.GuardMethod;
+import ch.usi.dag.disl.GuardMethod;
 
 public class DumbLoopGuard {