scheduler: kill 'replaceable' scheduler

I don't actually need a replaceable scheduler; I need a scheduler that can
switch policies at will. Just remove this level of abstraction for now (it can
be added later if needed).

diff --git a/model.cc b/model.cc
index 62b2925dc0e4f46ba79df049500363c4f29d9fdc..d929c48b0948c95ff6652fbe0c7baf9c256aae4f 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -11,7 +11,7 @@ ModelChecker::ModelChecker()
        /* First thread created (system_thread) will have id 1 */
        this->used_thread_id = 0;
        /* Initialize default scheduler */
-       this->scheduler = new DefaultScheduler();
+       this->scheduler = new Scheduler();
 
        this->current_action = NULL;
 }

diff --git a/schedule.cc b/schedule.cc
index 0dae851abe0325fb058759c9d1d44b53cc612cf8..abb3e4b3975f34c3cbaf876ead0af680699864d9 100644 (file)
--- a/schedule.cc
+++ b/schedule.cc
@@ -3,13 +3,13 @@
 #include "common.h"
 #include "model.h"
 
-void DefaultScheduler::add_thread(struct thread *t)
+void Scheduler::add_thread(struct thread *t)
 {
        DEBUG("thread %d\n", t->id);
        queue.push(t);
 }
 
-struct thread *DefaultScheduler::next_thread(void)
+struct thread *Scheduler::next_thread(void)
 {
        if (queue.empty())
                return NULL;
@@ -20,7 +20,7 @@ struct thread *DefaultScheduler::next_thread(void)
        return current;
 }
 
-struct thread *DefaultScheduler::get_current_thread(void)
+struct thread *Scheduler::get_current_thread(void)
 {
        return current;
 }

diff --git a/schedule.h b/schedule.h
index 8e306752da7a1c43d7e10f8fb106473eb6284636..83416008eb01f2e0dba5e3886e49fdda52e68846 100644 (file)
--- a/schedule.h
+++ b/schedule.h
@@ -7,13 +7,6 @@
 #include "model.h"
 
 class Scheduler {
-public:
-       virtual void add_thread(struct thread *t) = 0;
-       virtual struct thread * next_thread(void) = 0;
-       virtual struct thread * get_current_thread(void) = 0;
-};
-
-class DefaultScheduler: public Scheduler {
 public:
        void add_thread(struct thread *t);
        struct thread * next_thread(void);