X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;ds=sidebyside;f=schedule.cc;h=e87490313cf4836e1f11dab9528ef7ad00b6bf26;hb=5fa2efec1354b2781ff0b29460ec8e9b8fa75991;hp=6d7b63d13390b22d9320409c01676c3452caeb6b;hpb=1857316e6637ac144952a274ff020629abe83807;p=c11tester.git

diff --git a/schedule.cc b/schedule.cc
index 6d7b63d1..e8749031 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -190,22 +190,21 @@ 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;
 }
 
 /**