X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=schedule.cc;h=1791605b7c38842c37d11553c37f663c9dc88c38;hp=0f550c41962a5046c6934fe5380d17e0cda39e36;hb=08b08df583f48064ec920b56162526f38b1db481;hpb=1873837128eca281cb7ccae1ca564af56e1e10b4

diff --git a/schedule.cc b/schedule.cc
index 0f550c4..1791605 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -3,13 +3,26 @@
 #include "common.h"
 #include "model.h"
 
+Scheduler::Scheduler() :
+	current(NULL)
+{
+}
+
 void Scheduler::add_thread(Thread *t)
 {
 	DEBUG("thread %d\n", t->get_id());
 	readyList.push_back(t);
 }
 
-Thread *Scheduler::next_thread(void)
+void Scheduler::remove_thread(Thread *t)
+{
+	if (current == t)
+		current = NULL;
+	else
+		readyList.remove(t);
+}
+
+Thread * Scheduler::next_thread(void)
 {
 	Thread *t = model->schedule_next_thread();
 
@@ -29,7 +42,7 @@ Thread *Scheduler::next_thread(void)
 	return t;
 }
 
-Thread *Scheduler::get_current_thread(void)
+Thread * Scheduler::get_current_thread(void)
 {
 	return current;
 }
@@ -37,12 +50,12 @@ Thread *Scheduler::get_current_thread(void)
 void Scheduler::print()
 {
 	if (current)
-		printf("Current thread: %d\n", current->get_id());
+		DEBUG("Current thread: %d\n", current->get_id());
 	else
-		printf("No current thread\n");
-	printf("Num. threads in ready list: %ld\n", readyList.size());
+		DEBUG("No current thread\n");
+	DEBUG("Num. threads in ready list: %zu\n", readyList.size());
 
-	std::list<Thread *>::iterator it;
+	std::list<Thread *, MyAlloc< Thread * > >::iterator it;
 	for (it = readyList.begin(); it != readyList.end(); it++)
-		printf("In ready list: thread %d\n", (*it)->get_id());
+		DEBUG("In ready list: thread %d\n", (*it)->get_id());
 }