X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=62ba8fb3ff0ee631d960649286142d0608560135;hb=10dbb93b23ef00daaa60bccc5f25764cda298a61;hp=a2eb4cf7254834fecac49905838d53b647b95de5;hpb=2daff868a7ef4f6235c2776b746cec9947a87b13;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index a2eb4cf..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) {
@@ -200,26 +200,42 @@ void Scheduler::wake(Thread *t)
 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);
-			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;
+			}
 		}
-	}
+	}	
 
 	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);
 		}
 	}
+	
 	/* No thread was enabled */
 	return NULL;
 }
@@ -234,7 +250,7 @@ void Scheduler::set_scheduler_thread(thread_id_t tid) {
  */
 void Scheduler::set_current_thread(Thread *t)
 {
-	ASSERT(t && !t->is_model_thread());
+	ASSERT(!t || !t->is_model_thread());
 
 	current = t;
 	if (DBG_ENABLED())