-#include <stdlib.h>
-
-#include "libthreads.h"
+#include "threads.h"
#include "schedule.h"
#include "common.h"
#include "model.h"
-struct thread_list_node {
- struct thread *t;
- struct thread_list_node *next;
- int live;
-};
-
-#define NUM_LIST_NODES 32
-
-struct thread_list_node *head, *tail;
-struct thread_list_node nodes[NUM_LIST_NODES];
-struct thread *current;
-
-static void enqueue_thread(struct thread *t)
+Scheduler::Scheduler() :
+ current(NULL)
{
- int i;
- struct thread_list_node *node;
+}
- for (node = nodes, i = 0; node->live && i < NUM_LIST_NODES; i++, node++);
- if (i >= NUM_LIST_NODES) {
- printf("ran out of nodes\n");
- exit(1);
- }
- node->t = t;
- node->next = NULL;
- node->live = 1;
+void Scheduler::add_thread(Thread *t)
+{
+ DEBUG("thread %d\n", t->get_id());
+ readyList.push_back(t);
+}
- if (tail)
- tail->next = node;
+void Scheduler::remove_thread(Thread *t)
+{
+ if (current == t)
+ current = NULL;
else
- head = node;
- tail = node;
+ readyList.remove(t);
}
-static struct thread *dequeue_thread(void)
+Thread * Scheduler::next_thread(void)
{
- struct thread *pop;
-
- if (!head)
- return NULL;
-
- pop = head->t;
- head->live = 0;
- if (head == tail)
- tail = NULL;
- head = head->next;
+ 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();
+ }
- /* Set new current thread */
- current = pop;
+ print();
- return pop;
+ return t;
}
-void DefaultScheduler::add_thread(struct thread *t)
+Thread * Scheduler::get_current_thread(void)
{
- DEBUG("thread %d\n", t->id);
- enqueue_thread(t);
+ return current;
}
-struct thread *DefaultScheduler::next_thread(void)
+void Scheduler::print()
{
- return dequeue_thread();
-}
+ 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());
-struct thread *DefaultScheduler::get_current_thread(void)
-{
- return current;
+ 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());
}