X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=62ba8fb3ff0ee631d960649286142d0608560135;hb=20994240335ce1d54fb6c4b2c8df684182f0a3f9;hp=d49e62bae3a9101a204df7a81f7eea557a5614dd;hpb=b3786419ac8bbc47f33038b1d6c595a70490e634;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index d49e62b..62ba8fb 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -12,7 +12,7 @@
  * @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) {
@@ -96,6 +96,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());
@@ -177,43 +194,54 @@ void Scheduler::wake(Thread *t)
 }
 
 /**
- * Select a Thread to run and set it as the 'current' Thread. This
- * implementation defaults to round-robin
- *
+ * @brief Select a Thread to run via round-robin
  * @return The next Thread to run
  */
 Thread * Scheduler::select_next_thread()
 {
 	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);
-			//Have a thread with priority
-			if (enabled[i] != THREAD_DISABLED)
-				have_enabled_thread_with_priority = true;
+	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;
+			}
 		}
-	}
+	}	
 
-	while (true) {
-		curr_thread_index = (curr_thread_index + 1) % enabled_len;
+	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))) {
-			current = model->get_thread(curr_tid);
-			if (DBG_ENABLED())
-				print();
-			return current;
-		}
-		if (curr_thread_index == old_curr_thread) {
-			if (DBG_ENABLED())
-				print();
-			return NULL;
+			return model->get_thread(curr_tid);
 		}
 	}
+	
+	/* No thread was enabled */
+	return NULL;
+}
+
+void Scheduler::set_scheduler_thread(thread_id_t tid) {
+	curr_thread_index=id_to_int(tid);
 }
 
 /**
@@ -222,9 +250,7 @@ Thread * Scheduler::select_next_thread()
  */
 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())