model: rename print_trace() -> print_summary(), fixup summary printing

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index bf956804479f3f1e82fe8f04fb273d50ce7c9cbb..9d23788e8939746cd8bf720e2c8ece25e46f8ae7 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -13,6 +13,7 @@ ModelChecker::ModelChecker()
        /* Initialize default scheduler */
        this->scheduler = new Scheduler();
 
+       num_executions = 0;
        this->current_action = NULL;
        this->exploring = NULL;
        this->nextThread = THREAD_ID_T_NONE;
@@ -29,9 +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 ? */
+}
+
+int ModelChecker::get_next_id()
+{
+       return ++used_thread_id;
 }
 
 void ModelChecker::add_system_thread(Thread *t)
@@ -39,7 +55,7 @@ void ModelChecker::add_system_thread(Thread *t)
        this->system_thread = t;
 }
 
-Thread *ModelChecker::schedule_next_thread()
+Thread * ModelChecker::schedule_next_thread()
 {
        Thread *t;
        if (nextThread == THREAD_ID_T_NONE)
@@ -93,7 +109,18 @@ thread_id_t ModelChecker::advance_backtracking_state()
        return get_next_replay_thread();
 }
 
-ModelAction *ModelChecker::get_last_conflict(ModelAction *act)
+bool ModelChecker::next_execution()
+{
+       num_executions++;
+       print_summary();
+       if ((exploring = model->get_next_backtrack()) == NULL)
+               return false;
+       model->reset_to_initial_state();
+       nextThread = get_next_replay_thread();
+       return true;
+}
+
+ModelAction * ModelChecker::get_last_conflict(ModelAction *act)
 {
        void *loc = act->get_location();
        action_type type = act->get_type();
@@ -152,6 +179,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;
@@ -167,14 +204,19 @@ 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;
 
        printf("\n");
        printf("---------------------------------------------------------------------\n");
+       printf("Number of executions: %d\n", num_executions);
        printf("Total nodes created: %d\n\n", TreeNode::getTotalNodes());
 
+       scheduler->print();
+
+       printf("Trace:\n\n");
+
        for (it = action_trace->begin(); it != action_trace->end(); it++) {
                DBG();
                (*it)->print();
@@ -185,9 +227,15 @@ 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;