major rewrite - 'struct thread' replaced with internal 'class Thread'

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index c02ca62b12a16cd1c07d58ffd20f1ac383b57181..60d84a8af6b307d1d51d892e3712aa8d8910ab87 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,28 +1,26 @@
-#include <stdlib.h>
-
-#include "libthreads.h"
+#include "threads_internal.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
 
-void DefaultScheduler::add_thread(struct thread *t)
+void Scheduler::add_thread(Thread *t)
 {
-       DEBUG("thread %d\n", t->id);
-       queue.push_back(t);
+       DEBUG("thread %d\n", t->get_id());
+       queue.push(t);
 }
 
-struct thread *DefaultScheduler::next_thread(void)
+Thread *Scheduler::next_thread(void)
 {
        if (queue.empty())
                return NULL;
 
        current = queue.front();
-       queue.pop_front();
+       queue.pop();
 
        return current;
 }
 
-struct thread *DefaultScheduler::get_current_thread(void)
+Thread *Scheduler::get_current_thread(void)
 {
        return current;
 }