X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=67b40ec88a809d5c2bff10e07787481a7d934566;hb=d279e84ed265af079ea035d5dff49183def2c144;hp=2498347c44cc6e2cb6cbb870a829465c318504db;hpb=5e2338d51de26e3ea875587f62b095c5d0111ae2;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index 2498347..67b40ec 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -9,26 +9,27 @@ void Scheduler::add_thread(Thread *t)
 	readyList.push_back(t);
 }
 
-Thread *Scheduler::next_thread(void)
+Thread * Scheduler::next_thread(void)
 {
 	Thread *t = model->schedule_next_thread();
 
-	print();
-
 	if (t != NULL) {
+		current = t;
 		readyList.remove(t);
-		return t;
+	} else if (readyList.empty()) {
+		t = NULL;
+	} else {
+		t = readyList.front();
+		current = t;
+		readyList.pop_front();
 	}
-	if (readyList.empty())
-		return NULL;
 
-	current = readyList.front();
-	readyList.pop_front();
+	print();
 
-	return current;
+	return t;
 }
 
-Thread *Scheduler::get_current_thread(void)
+Thread * Scheduler::get_current_thread(void)
 {
 	return current;
 }
@@ -39,7 +40,7 @@ void Scheduler::print()
 		printf("Current thread: %d\n", current->get_id());
 	else
 		printf("No current thread\n");
-	printf("# Threads in ready list: %ld\n", readyList.size());
+	printf("Num. threads in ready list: %ld\n", readyList.size());
 
 	std::list<Thread *>::iterator it;
 	for (it = readyList.begin(); it != readyList.end(); it++)