added end of thread execution as default sync event

changed rs for Example1 accordingly
kheradmand · Feb 7, 2015 · 82aae9c · 82aae9c
1 parent 22f6227
commit 82aae9c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/examples/Example1/Example1.rs b/examples/Example1/Example1.rs
@@ -15,5 +15,5 @@ after_sync:
 	default
 	;
 
-schedule: 1 x 7 , 10 x 5 , 1 x 1 , 10 x 1 ;
+schedule: 1 x 7 , 10 x 5 , 1 x 2 , 10 x 2 ;
 
diff --git a/src/main/java/replaymop/output/AspectJGenerator.java b/src/main/java/replaymop/output/AspectJGenerator.java
@@ -41,6 +41,8 @@ void generateBeforeSyncPointCut() {
 		StringJoiner pointcuts = new StringJoiner(" ||\n\t\t\t");
 		if (spec.beforeMonitorEnter)
 			pointcuts.add("lock()");
+		if (spec.afterThreadBegin) //trick: before run execution = after thread begin
+			pointcuts.add("execution(* Thread+.run())"); 
 		for (String sync : spec.beforeSync){
 			pointcuts.add(String.format("call(%s)", sync));
 		}
@@ -51,6 +53,8 @@ void generateAfterSyncPointCut() {
 		StringJoiner pointcuts = new StringJoiner(" ||\n\t\t\t");
 		if (spec.afterMonitorExit)
 			pointcuts.add("unlock()");
+		if (spec.beforeThreadEnd) //trick: after run execution = before thread end
+			pointcuts.add("execution(* Thread+.run())");
 		for (String sync : spec.afterSync){
 			pointcuts.add(String.format("call(%s)", sync));
 		}

diff --git a/src/main/java/replaymop/parser/RSParser.java b/src/main/java/replaymop/parser/RSParser.java
@@ -84,6 +84,8 @@ void handleBeforeSync() throws ReplayMOPException {
 				spec.addBeforeSyncDefault();
 			else if (func.equals("synchronized"))
 				spec.beforeMonitorEnter = true;
+			else if (func.equals("begin"))
+				spec.beforeThreadEnd = true;
 			else if (func.equals(";"))
 				return;
 			else
@@ -100,7 +102,9 @@ void handleAfterSync() throws ReplayMOPException {
 			if (func.equals("default"))
 				spec.addAfterSyncDefault();
 			else if (func.equals("synchronized"))
-				spec.afterMonitorExit = false;
+				spec.afterMonitorExit = true;
+			else if (func.equals("begin"))
+				spec.afterThreadBegin = true;
 			else if (func.equals(";"))
 				return;
 			else

diff --git a/src/main/java/replaymop/parser/rs/ReplaySpecification.java b/src/main/java/replaymop/parser/rs/ReplaySpecification.java
@@ -14,8 +14,10 @@ public class ReplaySpecification {
 	public Set<Variable> shared;
 	public Set<String> beforeSync;
 	public boolean beforeMonitorEnter = false;
+	public boolean beforeThreadEnd = false;
 	public Set<String> afterSync;
 	public boolean afterMonitorExit = false;
+	public boolean afterThreadBegin = false;
 	public List<ScheduleUnit> schedule;
 	public String input;
 
@@ -40,11 +42,13 @@ public ReplaySpecification() {
 
 	public void addBeforeSyncDefault(){
 		beforeMonitorEnter = true;
+		beforeThreadEnd = true;
 		beforeSync.addAll(Arrays.asList(beforeSyncDefault));
 	}
 
 	public void addAfterSyncDefault(){
 		afterMonitorExit = true;
+		//afterThreadBegin = true;
 		afterSync.addAll(Arrays.asList(afterSyncDefault));
 
 	}