fix various problems with my 64-bit clean hack

[model-checker.git] / schedule.cc

diff --git a/schedule.cc b/schedule.cc
index 67b40ec88a809d5c2bff10e07787481a7d934566..328bda6990c3e55a61574261f893fa77a9031eaa 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -1,14 +1,29 @@
+/* -*- Mode: C; indent-tabs-mode: t -*- */
+
 #include "threads.h"
 #include "schedule.h"
 #include "common.h"
 #include "model.h"
 
+Scheduler::Scheduler(): 
+current(NULL) 
+{
+}
+
 void Scheduler::add_thread(Thread *t)
 {
        DEBUG("thread %d\n", t->get_id());
        readyList.push_back(t);
 }
 
+void Scheduler::remove_thread(Thread *t)
+{
+       if (current == t)
+               current = NULL;
+       else
+               readyList.remove(t);
+}
+
 Thread * Scheduler::next_thread(void)
 {
        Thread *t = model->schedule_next_thread();
@@ -37,12 +52,12 @@ Thread * Scheduler::get_current_thread(void)
 void Scheduler::print()
 {
        if (current)
-               printf("Current thread: %d\n", current->get_id());
+               DEBUG("Current thread: %d\n", current->get_id());
        else
-               printf("No current thread\n");
-       printf("Num. threads in ready list: %ld\n", readyList.size());
+               DEBUG("No current thread\n");
+       DEBUG("Num. threads in ready list: %zu\n", readyList.size());
 
-       std::list<Thread *>::iterator it;
+       std::list<Thread *, MyAlloc< Thread * > >::iterator it;
        for (it = readyList.begin(); it != readyList.end(); it++)
-               printf("In ready list: thread %d\n", (*it)->get_id());
+               DEBUG("In ready list: thread %d\n", (*it)->get_id());
 }