X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=1bd1b0f983fef2a602fe6b089db723c4526adc4a;hb=3f77119600ac3aa246258dec2776056d09f8e4e0;hp=6d7b63d13390b22d9320409c01676c3452caeb6b;hpb=1857316e6637ac144952a274ff020629abe83807;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index 6d7b63d..1bd1b0f 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -190,22 +190,25 @@ Thread * Scheduler::select_next_thread()
 		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;
 		}
 	}
 
-	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 (enabled[curr_thread_index] == THREAD_ENABLED &&
 				(!have_enabled_thread_with_priority || n->has_priority(curr_tid))) {
 			return model->get_thread(curr_tid);
 		}
-		if (curr_thread_index == old_curr_thread)
-			return NULL;
 	}
+	/* No thread was enabled */
+	return NULL;
+}
+
+void Scheduler::set_scheduler_thread(thread_id_t tid) {
+	curr_thread_index=id_to_int(tid);
 }
 
 /**
@@ -216,7 +219,7 @@ void Scheduler::set_current_thread(Thread *t)
 {
 	ASSERT(t && !t->is_model_thread());
 
-	curr_thread_index = id_to_int(t->get_id());
+	//curr_thread_index = id_to_int(t->get_id());
 
 	current = t;
 	if (DBG_ENABLED())