X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=f26a1a6a133b569ed25c72141545ae061fbdb9b2;hb=89ecd60fab0d93d6df6aa35e663ab67db860fa1d;hp=8d44eec6d7648b467aa2bc3bf0abfc1c3478ca38;hpb=30999f20b8426081e676adfc76d1c4af7b941e8e;p=c11tester.git

diff --git a/schedule.cc b/schedule.cc
index 8d44eec6..f26a1a6a 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -6,13 +6,15 @@
 #include "common.h"
 #include "model.h"
 #include "nodestack.h"
+#include "execution.h"
+#include "fuzzer.h"
 
 /**
  * Format an "enabled_type_t" for printing
  * @param e The type to format
  * @param str The output character array
  */
-static void enabled_type_to_string(enabled_type_t e, char *str)
+void enabled_type_to_string(enabled_type_t e, char *str)
 {
 	const char *res;
 	switch (e) {
@@ -35,6 +37,7 @@ static 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 +45,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 +67,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();
 }
 
 /**
@@ -96,6 +106,23 @@ bool Scheduler::is_sleep_set(const Thread *t) const
 	return get_enabled(t) == THREAD_SLEEP_SET;
 }
 
+/**
+ * @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;
+ * false otherwise
+ */
+bool Scheduler::all_threads_sleeping() const
+{
+	bool sleeping = false;
+	for (int i = 0;i < enabled_len;i++)
+		if (enabled[i] == THREAD_ENABLED)
+			return false;
+		else if (enabled[i] == THREAD_SLEEP_SET)
+			sleeping = true;
+	return sleeping;
+}
+
 enabled_type_t Scheduler::get_enabled(const Thread *t) const
 {
 	int id = id_to_int(t->get_id());
@@ -103,15 +130,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
@@ -178,33 +196,27 @@ 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()
+Thread * Scheduler::select_next_thread(Node *n)
 {
-	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)) {
-			DEBUG("Node (tid %d) has priority\n", i);
-			if (enabled[i] != THREAD_DISABLED)
-				have_enabled_thread_with_priority = true;
-		}
+	int avail_threads = 0;
+	int thread_list[enabled_len];
+	for (int i = 0;i< enabled_len;i++) {
+		if (enabled[i] == THREAD_ENABLED)
+			thread_list[avail_threads++] = i;
 	}
 
-	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 (enabled[curr_thread_index] == THREAD_ENABLED &&
-				(!have_enabled_thread_with_priority || n->has_priority(curr_tid))) {
-			return model->get_thread(curr_tid);
-		}
-	}
-	/* No thread was enabled */
-	return NULL;
+	if (avail_threads == 0)
+		return NULL;				// No threads availablex
+
+	Thread * thread = execution->getFuzzer()->selectThread(n, thread_list, avail_threads);
+	curr_thread_index = id_to_int(thread->get_id());
+	return thread;
 }
 
 void Scheduler::set_scheduler_thread(thread_id_t tid) {
@@ -217,9 +229,7 @@ void Scheduler::set_scheduler_thread(thread_id_t tid) {
  */
 void Scheduler::set_current_thread(Thread *t)
 {
-	ASSERT(t && !t->is_model_thread());
-
-	//	curr_thread_index = id_to_int(t->get_id());
+	ASSERT(!t || !t->is_model_thread());
 
 	current = t;
 	if (DBG_ENABLED())
@@ -244,7 +254,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);