X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=schedule.cc;h=d96172e010d445a2b06eff5b392b89161126f12e;hb=5fe0eea8bf392753f69ed8193a592b299a137e9c;hp=0dae851abe0325fb058759c9d1d44b53cc612cf8;hpb=3ad29c55c8a1647b1f6d753d08d8838e8a636e1f;p=model-checker.git

diff --git a/schedule.cc b/schedule.cc
index 0dae851..d96172e 100644
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,26 +1,83 @@
-#include "libthreads.h"
+#include "threads.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
 
-void DefaultScheduler::add_thread(struct thread *t)
+/** Constructor */
+Scheduler::Scheduler() :
+	current(NULL)
 {
-	DEBUG("thread %d\n", t->id);
-	queue.push(t);
 }
 
-struct thread *DefaultScheduler::next_thread(void)
+/**
+ * Add a Thread to the scheduler's ready list.
+ * @param t The Thread to add
+ */
+void Scheduler::add_thread(Thread *t)
 {
-	if (queue.empty())
-		return NULL;
+	DEBUG("thread %d\n", t->get_id());
+	readyList.push_back(t);
+}
+
+/**
+ * Remove a given Thread from the scheduler.
+ * @param t The Thread to remove
+ */
+void Scheduler::remove_thread(Thread *t)
+{
+	if (current == t)
+		current = NULL;
+	else
+		readyList.remove(t);
+}
 
-	current = queue.front();
-	queue.pop();
+/**
+ * Remove one Thread from the scheduler. This implementation defaults to FIFO,
+ * if a thread is not already provided.
+ *
+ * @param t Thread to run, if chosen by an external entity (e.g.,
+ * ModelChecker). May be NULL to indicate no external choice.
+ * @return The next Thread to run
+ */
+Thread * Scheduler::next_thread(Thread *t)
+{
+	if (t != NULL) {
+		current = t;
+		readyList.remove(t);
+	} else if (readyList.empty()) {
+		t = NULL;
+	} else {
+		t = readyList.front();
+		current = t;
+		readyList.pop_front();
+	}
 
-	return current;
+	print();
+
+	return t;
 }
 
-struct thread *DefaultScheduler::get_current_thread(void)
+/**
+ * @return The currently-running Thread
+ */
+Thread * Scheduler::get_current_thread() const
 {
 	return current;
 }
+
+/**
+ * Print debugging information about the current state of the scheduler. Only
+ * prints something if debugging is enabled.
+ */
+void Scheduler::print() const
+{
+	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 * > >::const_iterator it;
+	for (it = readyList.begin(); it != readyList.end(); it++)
+		DEBUG("In ready list: thread %d\n", (*it)->get_id());
+}