Correction for deadlocked CT test cases

overturetool · Sep 27, 2013 · 92156fd · 92156fd
1 parent 1a70398
commit 92156fd
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 11 deletions.
diff --git a/core/vdmj/src/main/java/org/overturetool/vdmj/scheduler/CTMainThread.java b/core/vdmj/src/main/java/org/overturetool/vdmj/scheduler/CTMainThread.java
@@ -29,7 +29,6 @@
 import org.overturetool.vdmj.Settings;
 import org.overturetool.vdmj.commands.DebuggerReader;
 import org.overturetool.vdmj.lex.LexLocation;
-import org.overturetool.vdmj.messages.Console;
 import org.overturetool.vdmj.runtime.Context;
 import org.overturetool.vdmj.runtime.ContextException;
 import org.overturetool.vdmj.statements.Statement;
@@ -161,16 +160,19 @@ public void body()
 		}
 		catch (Throwable e)
 		{
-			if (getException() != null)
+			if (result.lastIndexOf(Verdict.FAILED) < 0)
 			{
-				result.add(getException());
-			}
-			else
-			{
-				result.add(e.getMessage());
+				if (getException() != null)
+				{
+					result.add(getException());
+				}
+				else
+				{
+					result.add(e.getMessage());
+				}
+
+				result.add(Verdict.FAILED);
 			}
-
-			result.add(Verdict.FAILED);
 		}
 	}
 

diff --git a/core/vdmj/src/main/java/org/overturetool/vdmj/scheduler/ResourceScheduler.java b/core/vdmj/src/main/java/org/overturetool/vdmj/scheduler/ResourceScheduler.java
@@ -127,7 +127,7 @@ public void start(MainThread main)
 					{
 						try
                         {
-	                        Thread.sleep(500);
+	                        Thread.sleep(100);
                         }
                         catch (InterruptedException e)
                         {

diff --git a/core/vdmj/src/main/java/org/overturetool/vdmj/scheduler/SchedulablePoolThread.java b/core/vdmj/src/main/java/org/overturetool/vdmj/scheduler/SchedulablePoolThread.java
@@ -71,6 +71,16 @@ protected void beforeExecute(Thread t, Runnable r)
 			}
 
 		}
+
+		@Override
+		protected void afterExecute(Runnable r, Throwable t)
+		{
+			if (r instanceof SchedulablePoolThread)
+			{
+				SchedulablePoolThread spt = (SchedulablePoolThread) r;
+				spt.setThread(null);
+			}
+		}
 
 		/**
 		 * Prints an error message if a execution is rejected
@@ -464,7 +474,7 @@ public boolean isActive()
 	{
 		return state == RunState.TIMESTEP || state == RunState.WAITING;
 	}
-
+	
 	/* (non-Javadoc)
 	 * @see org.overturetool.vdmj.scheduler.ISchedulableThread#isVirtual()
 	 */
-Original file line number
+Diff line change
@@ Expand Up / @@ -127,7 +127,7 @@ public void start(MainThread main) @@
     					{
     						try
                             {
-    	                        Thread.sleep(500);
+    	                        Thread.sleep(100);
                             }
                             catch (InterruptedException e)
                             {
@@ Expand Down @@