added debug info to aspecj template

kheradmand · Feb 6, 2015 · 22f6227 · 22f6227
1 parent 9cbd912
commit 22f6227
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 7 deletions.
diff --git a/src/main/java/replaymop/Main.java b/src/main/java/replaymop/Main.java
@@ -36,7 +36,7 @@ public static void main(String[] args){
 			parseArguments(args);
 			File inputFile = new File(parameters.inputFile.get(0));
 			ReplaySpecification spec = RSParser.parse(inputFile);
-			Aspect aspect = AspectJGenerator.generate(spec);
+			Aspect aspect = AspectJGenerator.generate(spec, parameters);
 			File outputFile = new File(inputFile.getParent() + File.separator + aspect.name + ".aj");
 			PrintWriter writer = new PrintWriter(outputFile);
 			writer.println(aspect.toString());

diff --git a/src/main/java/replaymop/Parameters.java b/src/main/java/replaymop/Parameters.java
@@ -1,6 +1,5 @@
 package replaymop;
 
-import java.io.File;
 import java.util.List;
 
 import com.beust.jcommander.*;
@@ -9,6 +8,8 @@ public class Parameters {
 	@Parameter(description = "Input file")
 	public List<String> inputFile;
 
+	@Parameter(names = "-debug-runtime", description = "Causes the replayed program to print debug info")
+	public boolean debug_runtime = true;
 
 
 }
diff --git a/src/main/java/replaymop/output/AspectJGenerator.java b/src/main/java/replaymop/output/AspectJGenerator.java
@@ -4,15 +4,18 @@
 import java.util.List;
 import java.util.StringJoiner;
 
+import replaymop.Parameters;
 import replaymop.output.aspectj.Aspect;
 import replaymop.parser.rs.ReplaySpecification;
 
 public class AspectJGenerator {
 	ReplaySpecification spec;
 	Aspect aspect;
+	Parameters params;
 
-	private AspectJGenerator(ReplaySpecification spec) {
+	private AspectJGenerator(ReplaySpecification spec, Parameters params) {
 		this.spec = spec;
+		this.params = params;
 		aspect = new Aspect(spec.fileName + "Aspect");
 	}
 
@@ -67,6 +70,11 @@ void generateThreadSchedule() {
 				printList(counts));
 
 	}
+
+	void handleDebugInfo(){
+		aspect.setParameter("DEBUG_BEGIN", params.debug_runtime ? "" : "\\*");
+		aspect.setParameter("DEBUG_END", params.debug_runtime ? "" : "/*");
+	}
 
 	void startGeneration() {
 		generateThreadCreationOrder();
@@ -75,11 +83,12 @@ void startGeneration() {
 		generateBeforeSyncPointCut();
 		generateAfterSyncPointCut();
 		generateThreadSchedule();
+		handleDebugInfo();
 
 	}
 
-	public static Aspect generate(ReplaySpecification spec) {
-		AspectJGenerator generator = new AspectJGenerator(spec);
+	public static Aspect generate(ReplaySpecification spec, Parameters params) {
+		AspectJGenerator generator = new AspectJGenerator(spec, params);
 		generator.startGeneration();
 		return generator.aspect;
 	}

diff --git a/src/main/resources/AspectJTemplate.aj b/src/main/resources/AspectJTemplate.aj
@@ -86,14 +86,31 @@ public aspect %NAME% {
 				schedule_count[threadScheduleIndex]--;
 				if (schedule_count[threadScheduleIndex] == 0){
 					threadScheduleIndex++;
-					this.notifyAll();
+					threadScheduleLock.notifyAll();
 				}
 			} 	
 		}
 	}
 
 	//===========================sched enforce end===========================
 
-
+	//============================debug info begin===========================
+
+	%DEBUG_BEGIN%
+	before(): beforeSync() && !cflow(adviceexecution()) {
+		printThread();
+	}
+
+	after(): afterSync() && !cflow(adviceexecution()){
+		printThread();
+	}
+
+	void printThread(){
+		System.out.printf("%d sync event\n", Thread.currentThread().getId());
+	}
+	%DEBUG_END%
+
+
+	//============================debug info begin===========================
 
 }