X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.cc;h=dd35237b22232df0744e22baadaaceb54ae6affd;hp=5c93381b99763344d3fce9548a39955c041c6d79;hb=8a122ff2e84e0908df91e94f56b123a563592e64;hpb=c6fb6d40ad44767d31cb682d3d4e32c7bbb4b6d3

diff --git a/schedule.cc b/schedule.cc
index 5c93381b..dd35237b 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,3 +1,6 @@
+#include <string.h>
+#include <stdlib.h>
+
 #include "threads.h"
 #include "schedule.h"
 #include "common.h"
@@ -5,24 +8,37 @@
 
 /** Constructor */
 Scheduler::Scheduler() :
-	is_enabled(NULL),
+	enabled(NULL),
 	enabled_len(0),
 	curr_thread_index(0),
 	current(NULL)
 {
 }
 
-void Scheduler::set_enabled(Thread *t, bool enabled_status) {
+void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
 	int threadid=id_to_int(t->get_id());
 	if (threadid>=enabled_len) {
-		bool * new_enabled=(bool *)malloc(sizeof(bool)*(threadid+1));
-		memcpy(new_enabled, is_enabled, enabled_len*sizeof(bool));
-		memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(bool));
-		free(is_enabled);
-		is_enabled=new_enabled;
+		enabled_type_t *new_enabled = (enabled_type_t *)snapshot_malloc(sizeof(enabled_type_t) * (threadid + 1));
+		memset(&new_enabled[enabled_len], 0, (threadid+1-enabled_len)*sizeof(enabled_type_t));
+		if (enabled != NULL) {
+			memcpy(new_enabled, enabled, enabled_len*sizeof(enabled_type_t));
+			snapshot_free(enabled);
+		}
+		enabled=new_enabled;
 		enabled_len=threadid+1;
 	}
-	is_enabled[threadid]=enabled_status;
+	enabled[threadid]=enabled_status;
+}
+
+/**
+ * @brief Check if a Thread is currently enabled
+ * @param t The Thread to check
+ * @return True if the Thread is currently enabled
+ */
+bool Scheduler::is_enabled(Thread *t) const
+{
+	int id = id_to_int(t->get_id());
+	return (id >= enabled_len) ? false : (enabled[id] == THREAD_ENABLED);
 }
 
 /**
@@ -31,8 +47,9 @@ void Scheduler::set_enabled(Thread *t, bool enabled_status) {
  */
 void Scheduler::add_thread(Thread *t)
 {
-	DEBUG("thread %d\n", t->get_id());
-	set_enabled(t, true);
+	DEBUG("thread %d\n", id_to_int(t->get_id()));
+	ASSERT(!t->is_model_thread());
+	set_enabled(t, THREAD_ENABLED);
 }
 
 /**
@@ -43,7 +60,7 @@ void Scheduler::remove_thread(Thread *t)
 {
 	if (current == t)
 		current = NULL;
-	set_enabled(t, false);
+	set_enabled(t, THREAD_DISABLED);
 }
 
 /**
@@ -53,7 +70,7 @@ void Scheduler::remove_thread(Thread *t)
  */
 void Scheduler::sleep(Thread *t)
 {
-	set_enabled(t, false);
+	set_enabled(t, THREAD_DISABLED);
 	t->set_state(THREAD_BLOCKED);
 }
 
@@ -63,13 +80,14 @@ void Scheduler::sleep(Thread *t)
  */
 void Scheduler::wake(Thread *t)
 {
-	set_enabled(t, true);
+	ASSERT(!t->is_model_thread());
+	set_enabled(t, THREAD_DISABLED);
 	t->set_state(THREAD_READY);
 }
 
 /**
- * Remove one Thread from the scheduler. This implementation defaults to FIFO,
- * if a thread is not already provided.
+ * Select a Thread. This implementation defaults to round-robin, if a
+ * thread is not already provided.
  *
  * @param t Thread to run, if chosen by an external entity (e.g.,
  * ModelChecker). May be NULL to indicate no external choice.
@@ -77,12 +95,11 @@ void Scheduler::wake(Thread *t)
  */
 Thread * Scheduler::next_thread(Thread *t)
 {
-	printf("%p\n",t);
 	if ( t == NULL ) {
 		int old_curr_thread = curr_thread_index;
 		while(true) {
 			curr_thread_index = (curr_thread_index+1) % enabled_len;
-			if (is_enabled[curr_thread_index]) {
+			if (enabled[curr_thread_index]) {
 				t = model->get_thread(int_to_id(curr_thread_index));
 				break;
 			}
@@ -91,10 +108,12 @@ 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());
 	}
-	printf("index=%u enabled=%u\n", curr_thread_index, is_enabled[curr_thread_index]);
 
 	current = t;
 	print();
@@ -106,6 +125,7 @@ Thread * Scheduler::next_thread(Thread *t)
  */
 Thread * Scheduler::get_current_thread() const
 {
+	ASSERT(!current || !current->is_model_thread());
 	return current;
 }
 
@@ -116,7 +136,7 @@ Thread * Scheduler::get_current_thread() const
 void Scheduler::print() const
 {
 	if (current)
-		DEBUG("Current thread: %d\n", current->get_id());
+		DEBUG("Current thread: %d\n", id_to_int(current->get_id()));
 	else
 		DEBUG("No current thread\n");
 }