demote 'system_thread' to just 'system_context'

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index f3844f0ad1e1d70d0060934eef73ca7032a048d8..f1bc320b417e7c7f0938a73d50eff20b2a6b7301 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -30,14 +30,24 @@ ModelChecker::~ModelChecker()
        delete rootNode;
 }
 
-void ModelChecker::assign_id(Thread *t)
+void ModelChecker::reset_to_initial_state()
 {
-       t->set_id(++used_thread_id);
+       DEBUG("+++ Resetting to initial state +++\n");
+       std::map<thread_id_t, class Thread *>::iterator it;
+       for (it = thread_map.begin(); it != thread_map.end(); it++) {
+               delete (*it).second;
+       }
+       thread_map.clear();
+       action_trace = new action_list_t();
+       currentNode = rootNode;
+       current_action = NULL;
+       used_thread_id = 1; // ?
+       /* scheduler reset ? */
 }
 
-void ModelChecker::add_system_thread(Thread *t)
+int ModelChecker::get_next_id()
 {
-       this->system_thread = t;
+       return ++used_thread_id;
 }
 
 Thread * ModelChecker::schedule_next_thread()
@@ -97,6 +107,7 @@ thread_id_t ModelChecker::advance_backtracking_state()
 bool ModelChecker::next_execution()
 {
        num_executions++;
+       print_summary();
        if ((exploring = model->get_next_backtrack()) == NULL)
                return false;
        model->reset_to_initial_state();
@@ -130,7 +141,7 @@ ModelAction * ModelChecker::get_last_conflict(ModelAction *act)
                        continue;
                /* Conflict from the same thread is not really a conflict */
                if (id == prev->get_tid())
-                       return NULL;
+                       continue;
                return prev;
        }
        return NULL;
@@ -163,6 +174,16 @@ void ModelChecker::set_backtracking(ModelAction *act)
        backtrack_list.push_back(back);
 }
 
+Backtrack * ModelChecker::get_next_backtrack()
+{
+       Backtrack *next;
+       if (backtrack_list.empty())
+               return NULL;
+       next = backtrack_list.back();
+       backtrack_list.pop_back();
+       return next;
+}
+
 void ModelChecker::check_current_action(void)
 {
        ModelAction *next = this->current_action;
@@ -171,6 +192,7 @@ void ModelChecker::check_current_action(void)
                DEBUG("trying to push NULL action...\n");
                return;
        }
+       current_action = NULL;
        nextThread = advance_backtracking_state();
        next->set_node(currentNode);
        set_backtracking(next);
@@ -178,7 +200,7 @@ void ModelChecker::check_current_action(void)
        this->action_trace->push_back(next);
 }
 
-void ModelChecker::print_trace(void)
+void ModelChecker::print_summary(void)
 {
        action_list_t::iterator it;
 
@@ -189,7 +211,7 @@ void ModelChecker::print_trace(void)
 
        scheduler->print();
 
-       printf("\nTrace:\n\n");
+       printf("Trace:\n\n");
 
        for (it = action_trace->begin(); it != action_trace->end(); it++) {
                DBG();
@@ -201,19 +223,24 @@ void ModelChecker::print_trace(void)
 int ModelChecker::add_thread(Thread *t)
 {
        thread_map[t->get_id()] = t;
+       scheduler->add_thread(t);
        return 0;
 }
 
+void ModelChecker::remove_thread(Thread *t)
+{
+       scheduler->remove_thread(t);
+}
+
 int ModelChecker::switch_to_master(ModelAction *act)
 {
-       Thread *old, *next;
+       Thread *old;
 
        DBG();
        old = thread_current();
        set_current_action(act);
        old->set_state(THREAD_READY);
-       next = system_thread;
-       return old->swap(next);
+       return Thread::swap(old, get_system_context());
 }
 
 ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value)