X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=schedule.cc;h=f68786a825698f64052729f5032b332a3925e824;hp=136f4622fb3ff1d16aa59a8b9d41a6c62df2f930;hb=a72579537233ec7d21ac24d895b9cbe7cfe16f2d;hpb=5d806b4bc80d6df106c78f47b336ef9d2aad7f3d

diff --git a/schedule.cc b/schedule.cc
index 136f4622..f68786a8 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -5,7 +5,8 @@
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
-#include "nodestack.h"
+#include "execution.h"
+#include "fuzzer.h"
 
 /**
  * Format an "enabled_type_t" for printing
@@ -35,6 +36,7 @@ void enabled_type_to_string(enabled_type_t e, char *str)
 
 /** Constructor */
 Scheduler::Scheduler() :
+	execution(NULL),
 	enabled(NULL),
 	enabled_len(0),
 	curr_thread_index(0),
@@ -42,6 +44,15 @@ Scheduler::Scheduler() :
 {
 }
 
+/**
+ * @brief Register the ModelExecution engine
+ * @param execution The ModelExecution which is controlling execution
+ */
+void Scheduler::register_engine(ModelExecution *execution)
+{
+	this->execution = execution;
+}
+
 void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
 	int threadid = id_to_int(t->get_id());
 	if (threadid >= enabled_len) {
@@ -55,8 +66,6 @@ void Scheduler::set_enabled(Thread *t, enabled_type_t enabled_status) {
 		enabled_len = threadid + 1;
 	}
 	enabled[threadid] = enabled_status;
-	if (enabled_status == THREAD_DISABLED)
-		model->check_promises_thread_disabled();
 }
 
 /**
@@ -99,13 +108,13 @@ bool Scheduler::is_sleep_set(const Thread *t) const
 /**
  * @brief Check if execution is stuck with no enabled threads and some sleeping
  * thread
- * @return True if no threads are enabled an some thread is in the sleep set;
+ * @return True if no threads are enabled and some thread is in the sleep set;
  * false otherwise
  */
 bool Scheduler::all_threads_sleeping() const
 {
 	bool sleeping = false;
-	for (int i = 0; i < enabled_len; i++)
+	for (int i = 0;i < enabled_len;i++)
 		if (enabled[i] == THREAD_ENABLED)
 			return false;
 		else if (enabled[i] == THREAD_SLEEP_SET)
@@ -120,15 +129,6 @@ enabled_type_t Scheduler::get_enabled(const Thread *t) const
 	return enabled[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
@@ -196,51 +196,39 @@ void Scheduler::wake(Thread *t)
 /**
  * @brief Select a Thread to run via round-robin
  *
- * @param n The current Node, holding priority information for the next thread
- * selection
  *
  * @return The next Thread to run
  */
-Thread * Scheduler::select_next_thread(Node *n)
+Thread * Scheduler::select_next_thread()
 {
-	int old_curr_thread = curr_thread_index;
-
-	bool have_enabled_thread_with_priority = false;
-	if (model->params.fairwindow != 0) {
-		for (int i = 0; i < enabled_len; i++) {
-			thread_id_t tid = int_to_id(i);
-			if (n->has_priority(tid)) {
-				DEBUG("Node (tid %d) has priority\n", i);
-				if (enabled[i] != THREAD_DISABLED)
-					have_enabled_thread_with_priority = true;
-			}
-		}
-	}	
+	int avail_threads = 0;
+	int sleep_threads = 0;
+	int thread_list[enabled_len], sleep_list[enabled_len];
+	Thread * thread;
 
 	for (int i = 0; i < enabled_len; i++) {
-		curr_thread_index = (old_curr_thread + i + 1) % enabled_len;
-		thread_id_t curr_tid = int_to_id(curr_thread_index);
-		if (model->params.yieldon) {
-			bool bad_thread = false;
-			for (int j = 0; j < enabled_len; j++) {
-				thread_id_t tother = int_to_id(j);
-				if ((enabled[j] != THREAD_DISABLED) && n->has_priority_over(curr_tid, tother)) {
-					bad_thread=true;
-					break;
-				}
-			}
-			if (bad_thread)
-				continue;
-		}
-		
-		if (enabled[curr_thread_index] == THREAD_ENABLED &&
-				(!have_enabled_thread_with_priority || n->has_priority(curr_tid))) {
-			return model->get_thread(curr_tid);
+		if (enabled[i] == THREAD_ENABLED)
+			thread_list[avail_threads++] = i;
+		else if (enabled[i] == THREAD_SLEEP_SET)
+			sleep_list[sleep_threads++] = i;
+	}
+
+	if (avail_threads == 0 && !execution->getFuzzer()->has_paused_threads()) {
+		if (sleep_threads != 0) {
+			// No threads available, but some threads sleeping. Wake up one of them
+			thread = execution->getFuzzer()->selectThread(sleep_list, sleep_threads);
+			remove_sleep(thread);
+			thread->set_wakeup_state(true);
+		} else {
+			return NULL;	// No threads available and no threads sleeping.
 		}
+	} else {
+		// Some threads are available
+		thread = execution->getFuzzer()->selectThread(thread_list, avail_threads);
 	}
-	
-	/* No thread was enabled */
-	return NULL;
+
+	curr_thread_index = id_to_int(thread->get_id());
+	return thread;
 }
 
 void Scheduler::set_scheduler_thread(thread_id_t tid) {
@@ -278,7 +266,7 @@ void Scheduler::print() const
 	int curr_id = current ? id_to_int(current->get_id()) : -1;
 
 	model_print("Scheduler: ");
-	for (int i = 0; i < enabled_len; i++) {
+	for (int i = 0;i < enabled_len;i++) {
 		char str[20];
 		enabled_type_to_string(enabled[i], str);
 		model_print("[%i: %s%s]", i, i == curr_id ? "current, " : "", str);