X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=1791605b7c38842c37d11553c37f663c9dc88c38;hb=bdef0741b8a01e16946d261bc2a657af5a683b3e;hp=c02ca62b12a16cd1c07d58ffd20f1ac383b57181;hpb=5f6566b5bd21517d0f963011ddf7bd919f8da7b9;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index c02ca62..1791605 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,28 +1,61 @@
-#include <stdlib.h>
-
-#include "libthreads.h"
+#include "threads.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
 
-void DefaultScheduler::add_thread(struct thread *t)
+Scheduler::Scheduler() :
+	current(NULL)
 {
-	DEBUG("thread %d\n", t->id);
-	queue.push_back(t);
 }
 
-struct thread *DefaultScheduler::next_thread(void)
+void Scheduler::add_thread(Thread *t)
 {
-	if (queue.empty())
-		return NULL;
+	DEBUG("thread %d\n", t->get_id());
+	readyList.push_back(t);
+}
 
-	current = queue.front();
-	queue.pop_front();
+void Scheduler::remove_thread(Thread *t)
+{
+	if (current == t)
+		current = NULL;
+	else
+		readyList.remove(t);
+}
 
-	return current;
+Thread * Scheduler::next_thread(void)
+{
+	Thread *t = model->schedule_next_thread();
+
+	if (t != NULL) {
+		current = t;
+		readyList.remove(t);
+	} else if (readyList.empty()) {
+		t = NULL;
+	} else {
+		t = readyList.front();
+		current = t;
+		readyList.pop_front();
+	}
+
+	print();
+
+	return t;
 }
 
-struct thread *DefaultScheduler::get_current_thread(void)
+Thread * Scheduler::get_current_thread(void)
 {
 	return current;
 }
+
+void Scheduler::print()
+{
+	if (current)
+		DEBUG("Current thread: %d\n", current->get_id());
+	else
+		DEBUG("No current thread\n");
+	DEBUG("Num. threads in ready list: %zu\n", readyList.size());
+
+	std::list<Thread *, MyAlloc< Thread * > >::iterator it;
+	for (it = readyList.begin(); it != readyList.end(); it++)
+		DEBUG("In ready list: thread %d\n", (*it)->get_id());
+}