model: implement, use schedule_next_thread()

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 6493022e090670e3c5dde9c0cbf924a9f2abc5f5..26fd6cae0c6f33b04c3c2e3139f8bdc03f56565c 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -14,13 +14,17 @@ ModelChecker::ModelChecker()
        this->scheduler = new Scheduler();
 
        this->current_action = NULL;
+       this->exploring = NULL;
+       this->nextThread = THREAD_ID_T_NONE;
 
        rootNode = new TreeNode(NULL);
        currentNode = rootNode;
+       action_trace = new action_list_t();
 }
 
 ModelChecker::~ModelChecker()
 {
+       delete action_trace;
        delete this->scheduler;
        delete rootNode;
 }
@@ -35,6 +39,17 @@ void ModelChecker::add_system_thread(Thread *t)
        this->system_thread = t;
 }
 
+Thread *ModelChecker::schedule_next_thread()
+{
+       Thread *t;
+       if (nextThread == THREAD_ID_T_NONE)
+               return NULL;
+       t = thread_map[nextThread];
+       if (t == NULL)
+               DEBUG("*** error: thread not in thread_map: id = %d\n", nextThread);
+       return t;
+}
+
 ModelAction *ModelChecker::get_last_conflict(ModelAction *act)
 {
        void *loc = act->get_location();
@@ -51,8 +66,8 @@ ModelAction *ModelChecker::get_last_conflict(ModelAction *act)
                default:
                        break;
        }
-       std::list<class ModelAction *>::reverse_iterator rit;
-       for (rit = action_trace.rbegin(); rit != action_trace.rend(); rit++) {
+       action_list_t::reverse_iterator rit;
+       for (rit = action_trace->rbegin(); rit != action_trace->rend(); rit++) {
                ModelAction *prev = *rit;
                if (prev->get_location() != loc)
                        continue;
@@ -89,9 +104,8 @@ void ModelChecker::set_backtracking(ModelAction *act)
        prev->print();
        act->print();
 
-       /* FIXME */
-       //Backtrack *back = new Backtrack(prev, actionList);
-       //backtrackList->Append(back);
+       Backtrack *back = new Backtrack(prev, action_trace);
+       backtrack_list.push_back(back);
 }
 
 void ModelChecker::check_current_action(void)
@@ -105,18 +119,18 @@ void ModelChecker::check_current_action(void)
        next->set_node(currentNode);
        set_backtracking(next);
        currentNode = currentNode->exploreChild(next->get_tid());
-       this->action_trace.push_back(next);
+       this->action_trace->push_back(next);
 }
 
 void ModelChecker::print_trace(void)
 {
-       std::list<class ModelAction *>::iterator it;
+       action_list_t::iterator it;
 
        printf("\n");
        printf("---------------------------------------------------------------------\n");
        printf("Total nodes created: %d\n\n", TreeNode::getTotalNodes());
 
-       for (it = action_trace.begin(); it != action_trace.end(); it++) {
+       for (it = action_trace->begin(); it != action_trace->end(); it++) {
                DBG();
                (*it)->print();
        }