X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=14e6475af1a781803647f7d3bd6fa56887ccf6d4;hb=c30a9cfd8df1150f6a2e89dde93781e334d4453d;hp=cca60ebfba45795252c4e3de97d1223b934aa0f4;hpb=e919b30ee6f7aa594c61fc305e6e88e789dbd700;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index cca60eb..14e6475 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,10 +1,11 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "threads.h"
+#include "threads-model.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
+#include "nodestack.h"
 
 /** Constructor */
 Scheduler::Scheduler() :
@@ -38,7 +39,40 @@ void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
 bool Scheduler::is_enabled(Thread *t) const
 {
 	int id = id_to_int(t->get_id());
-	return (id >= enabled_len) ? false : (enabled[id] == THREAD_ENABLED);
+	return (id >= enabled_len) ? false : (enabled[id] != THREAD_DISABLED);
+}
+
+enabled_type_t Scheduler::get_enabled(Thread *t) {
+	return enabled[id_to_int(t->get_id())];
+}
+
+void Scheduler::update_sleep_set(Node *n) {
+	enabled_type_t *enabled_array=n->get_enabled_array();
+	for(int i=0;i<enabled_len;i++) {
+		if (enabled_array[i]==THREAD_SLEEP_SET) {
+			enabled[i]=THREAD_SLEEP_SET;
+		}
+	}
+}
+
+/**
+ * Add a Thread to the sleep set.
+ * @param t The Thread to add
+ */
+void Scheduler::add_sleep(Thread *t)
+{
+	DEBUG("thread %d\n", id_to_int(t->get_id()));
+	set_enabled(t, THREAD_SLEEP_SET);
+}
+
+/**
+ * Remove a Thread from the sleep set.
+ * @param t The Thread to remove
+ */
+void Scheduler::remove_sleep(Thread *t)
+{
+	DEBUG("thread %d\n", id_to_int(t->get_id()));
+	set_enabled(t, THREAD_ENABLED);
 }
 
 /**
@@ -48,6 +82,7 @@ bool Scheduler::is_enabled(Thread *t) const
 void Scheduler::add_thread(Thread *t)
 {
 	DEBUG("thread %d\n", id_to_int(t->get_id()));
+	ASSERT(!t->is_model_thread());
 	set_enabled(t, THREAD_ENABLED);
 }
 
@@ -79,7 +114,8 @@ void Scheduler::sleep(Thread *t)
  */
 void Scheduler::wake(Thread *t)
 {
-	set_enabled(t, THREAD_DISABLED);
+	ASSERT(!t->is_model_thread());
+	set_enabled(t, THREAD_ENABLED);
 	t->set_state(THREAD_READY);
 }
 
@@ -95,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]) {
-				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) {
@@ -106,6 +156,9 @@ Thread * Scheduler::next_thread(Thread *t)
 				return NULL;
 			}
 		}
+	} else if (t->is_model_thread()) {
+		/* model-checker threads never run */
+		t = NULL;
 	} else {
 		curr_thread_index = id_to_int(t->get_id());
 	}
@@ -120,6 +173,7 @@ Thread * Scheduler::next_thread(Thread *t)
  */
 Thread * Scheduler::get_current_thread() const
 {
+	ASSERT(!current || !current->is_model_thread());
 	return current;
 }