Merge branch 'norris'

[c11tester.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 60d84a8af6b307d1d51d892e3712aa8d8910ab87..69e3d88803bcc06d15ee2fed115330b1397662f5 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,26 +1,81 @@
-#include "threads_internal.h"
+#include "threads.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
 
+/** Constructor */
+Scheduler::Scheduler() :
+       current(NULL)
+{
+}
+
+/**
+ * Add a Thread to the scheduler's ready list.
+ * @param t The Thread to add
+ */
 void Scheduler::add_thread(Thread *t)
 {
        DEBUG("thread %d\n", t->get_id());
-       queue.push(t);
+       readyList.push_back(t);
 }
 
-Thread *Scheduler::next_thread(void)
+/**
+ * Remove a given Thread from the scheduler.
+ * @param t The Thread to remove
+ */
+void Scheduler::remove_thread(Thread *t)
 {
-       if (queue.empty())
-               return NULL;
+       if (current == t)
+               current = NULL;
+       else
+               readyList.remove(t);
+}
 
-       current = queue.front();
-       queue.pop();
+/**
+ * Remove one Thread from the scheduler. This implementation performs FIFO.
+ * @return The next Thread to run
+ */
+Thread * Scheduler::next_thread()
+{
+       Thread *t = model->schedule_next_thread();
 
-       return current;
+       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;
 }
 
-Thread *Scheduler::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());
+}