X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=1cd5b0f1a9f3db7410965a8afad7e67f27a360d3;hb=d884d14a6288f1ee1809158e81ffb05bf83f483b;hp=ea1d58208ea2b692ed19596c2929a73b254fc998;hpb=b8b39c87557325a384faa45d0cae56a6f71f52b1;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index ea1d582..1cd5b0f 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"
@@ -43,7 +43,9 @@ bool Scheduler::is_enabled(Thread *t) const
 }
 
 enabled_type_t Scheduler::get_enabled(Thread *t) {
-	return enabled[id_to_int(t->get_id())];
+	int id = id_to_int(t->get_id());
+	ASSERT(id<enabled_len);
+	return enabled[id];
 }
 
 void Scheduler::update_sleep_set(Node *n) {
@@ -115,7 +117,7 @@ void Scheduler::sleep(Thread *t)
 void Scheduler::wake(Thread *t)
 {
 	ASSERT(!t->is_model_thread());
-	set_enabled(t, THREAD_DISABLED);
+	set_enabled(t, THREAD_ENABLED);
 	t->set_state(THREAD_READY);
 }
 
@@ -131,10 +133,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(curr_tid);
 				break;
 			}
 			if (curr_thread_index == old_curr_thread) {