schedule: replace queue with list

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index 67222e9f0c5cdf1be3a22edf882910439c72dc39..17ff0f96708d2792a2aae2e4910d8ed27baa3d87 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -17,10 +17,12 @@ ModelChecker::ModelChecker()
 
        rootNode = new TreeNode(NULL);
        currentNode = rootNode;
+       action_trace = new action_list_t();
 }
 
 ModelChecker::~ModelChecker()
 {
+       delete action_trace;
        delete this->scheduler;
        delete rootNode;
 }
@@ -35,6 +37,64 @@ void ModelChecker::add_system_thread(Thread *t)
        this->system_thread = t;
 }
 
+ModelAction *ModelChecker::get_last_conflict(ModelAction *act)
+{
+       void *loc = act->get_location();
+       action_type type = act->get_type();
+       thread_id_t id = act->get_tid();
+
+       switch (type) {
+               case THREAD_CREATE:
+               case THREAD_YIELD:
+               case THREAD_JOIN:
+                       return NULL;
+               case ATOMIC_READ:
+               case ATOMIC_WRITE:
+               default:
+                       break;
+       }
+       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;
+               if (type == ATOMIC_READ && prev->get_type() != ATOMIC_WRITE)
+                       continue;
+               /* Conflict from the same thread is not really a conflict */
+               if (id == prev->get_tid())
+                       return NULL;
+               return prev;
+       }
+       return NULL;
+}
+
+void ModelChecker::set_backtracking(ModelAction *act)
+{
+       ModelAction *prev;
+       TreeNode *node;
+
+       prev = get_last_conflict(act);
+       if (prev == NULL)
+               return;
+
+       node = prev->get_node();
+
+       /* Check if this has been explored already */
+       if (node->hasBeenExplored(act->get_tid()))
+               return;
+       /* If this is a new backtracking point, mark the tree */
+       if (node->setBacktrack(act->get_tid()) != 0)
+               return;
+
+       printf("Setting backtrack: conflict = %d, instead tid = %d\n",
+                       prev->get_tid(), act->get_tid());
+       prev->print();
+       act->print();
+
+       Backtrack *back = new Backtrack(prev, action_trace);
+       backtrack_list.push_back(back);
+}
+
 void ModelChecker::check_current_action(void)
 {
        ModelAction *next = this->current_action;
@@ -46,17 +106,22 @@ 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();
        }
+       printf("---------------------------------------------------------------------\n");
 }
 
 int ModelChecker::add_thread(Thread *t)