threads/model: move switch_to_master from class Thread to class ModelChecker

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 41dc44d34a8a0626e1a82de4bb59023e88aaa1e3..1015701d917803c75541fb2d3b830a0f223c301c 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;
 }
@@ -21,12 +21,12 @@ ModelChecker::~ModelChecker()
        delete this->scheduler;
 }
 
-void ModelChecker::assign_id(struct thread *t)
+void ModelChecker::assign_id(Thread *t)
 {
-       t->id = ++this->used_thread_id;
+       t->set_id(++used_thread_id);
 }
 
-void ModelChecker::add_system_thread(struct thread *t)
+void ModelChecker::add_system_thread(Thread *t)
 {
        this->system_thread = t;
 }
@@ -39,15 +39,43 @@ void ModelChecker::check_current_action(void)
                DEBUG("trying to push NULL action...\n");
 }
 
+void ModelChecker::print_trace(void)
+{
+       std::list<class ModelAction *>::iterator it;
+
+       for (it = action_trace.begin(); it != action_trace.end(); it++) {
+               DBG();
+               (*it)->print();
+       }
+}
+
+int ModelChecker::add_thread(Thread *t)
+{
+       thread_map[t->get_id()] = t;
+       return 0;
+}
+
+int ModelChecker::switch_to_master(ModelAction *act)
+{
+       Thread *old, *next;
+
+       DBG();
+       old = thread_current();
+       set_current_action(act);
+       old->set_state(THREAD_READY);
+       next = system_thread;
+       return old->swap(next);
+}
+
 ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value)
 {
-       struct thread *t = thread_current();
+       Thread *t = thread_current();
        ModelAction *act = this;
 
        act->type = type;
        act->order = order;
        act->location = loc;
-       act->tid = t->id;
+       act->tid = t->get_id();
        act->value = value;
 }