X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=f68cb528a16b846a2f2653ecd3336b6ca496fee8;hb=88e6ab1f325b2b67695f20954b5d1f1746d13c8a;hp=ec49a7448de6f34b1fa5acb38aaed83fd55dcfb7;hpb=a7f4b420cb8b12813d3feed76cf6af72b9803697;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index ec49a74..f68cb52 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,7 +1,7 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "threads.h"
+#include "threads-model.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
@@ -131,10 +131,24 @@ Thread * Scheduler::next_thread(Thread *t)
 {
 	if ( t == NULL ) {
 		int old_curr_thread = curr_thread_index;
+		bool have_enabled_thread_with_priority=false;
+		Node *n=model->get_curr_node();
+
+		for(int i=0;i<enabled_len;i++) {
+			thread_id_t tid=int_to_id(i);
+			if (n->has_priority(tid)) {
+				//Have a thread with priority
+				if (enabled[i]!=THREAD_DISABLED)
+					have_enabled_thread_with_priority=true;
+			}
+		}
+
 		while(true) {
 			curr_thread_index = (curr_thread_index+1) % enabled_len;
-			if (enabled[curr_thread_index]==THREAD_ENABLED) {
-				t = model->get_thread(int_to_id(curr_thread_index));
+			thread_id_t curr_tid=int_to_id(curr_thread_index);
+			if (enabled[curr_thread_index]==THREAD_ENABLED&&
+					(!have_enabled_thread_with_priority||n->has_priority(curr_tid))) {
+				t = model->get_thread(int_to_id(curr_tid));
 				break;
 			}
 			if (curr_thread_index == old_curr_thread) {