blank lines, spacing, etc.

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index 02a4a6a29206b34b8b3b22308439807b1b7c1188..8f8bd88baad9147aeb205829d820eaaad3a28d8c 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -15,8 +15,7 @@
 ModelChecker *model;
 
 /** @brief Constructor */
-ModelChecker::ModelChecker()
-       :
+ModelChecker::ModelChecker() :
        /* Initialize default scheduler */
        scheduler(new Scheduler()),
        /* First thread created will have id INITIAL_THREAD_ID */
@@ -42,9 +41,8 @@ ModelChecker::ModelChecker()
 /** @brief Destructor */
 ModelChecker::~ModelChecker()
 {
-       /*      std::map<int, Thread *>::iterator it;
-       for (it = thread_map->begin(); it != thread_map->end(); it++)
-       delete (*it).second;*/
+       for (int i = 0; i < get_num_threads(); i++)
+               delete thread_map->get(i);
        delete thread_map;
 
        delete obj_thrd_map;
@@ -173,8 +171,9 @@ bool ModelChecker::next_execution()
 
        num_executions++;
 
-       if (isfinalfeasible() || DBG_ENABLED())
-               print_summary();
+       bool feasible = isfinalfeasible();
+       if (feasible || DBG_ENABLED())
+               print_summary(feasible);
 
        if ((diverge = model->get_next_backtrack()) == NULL)
                return false;
@@ -284,7 +283,7 @@ void ModelChecker::check_current_action(void)
                        if (diverge==NULL) {
                                tmp->create_cv(get_parent_action(tmp->get_tid()));
                        }
-                       
+
                        delete curr;
                        curr = tmp;
                } else {
@@ -354,10 +353,11 @@ void ModelChecker::check_current_action(void)
        Node *currnode = curr->get_node();
        Node *parnode = currnode->get_parent();
 
-       if (!parnode->backtrack_empty()||!currnode->read_from_empty()||!currnode->future_value_empty()||!currnode->promise_empty())
+       if (!parnode->backtrack_empty() || !currnode->read_from_empty() ||
+                 !currnode->future_value_empty() || !currnode->promise_empty())
                if (!next_backtrack || *curr > *next_backtrack)
                        next_backtrack = curr;
-       
+
        set_backtracking(curr);
 }
 
@@ -403,7 +403,7 @@ void ModelChecker::r_modification_order(ModelAction * curr, const ModelAction *r
                        if (act->happens_before(curr)) {
                                if (act->is_read()) {
                                        const ModelAction * prevreadfrom=act->get_reads_from();
-                                       if (rf!=prevreadfrom)
+                                       if (prevreadfrom!=NULL&&rf!=prevreadfrom)
                                                cyclegraph->addEdge(rf, prevreadfrom);
                                } else if (rf!=act) {
                                        cyclegraph->addEdge(rf, act);
@@ -414,6 +414,43 @@ void ModelChecker::r_modification_order(ModelAction * curr, const ModelAction *r
        }
 }
 
+/** Updates the cyclegraph with the constraints imposed from the
+ *  current read. */
+void ModelChecker::post_r_modification_order(ModelAction * curr, const ModelAction *rf) {
+       std::vector<action_list_t> *thrd_lists = obj_thrd_map->ensureptr(curr->get_location());
+       unsigned int i;
+       ASSERT(curr->is_read());
+
+       /* Iterate over all threads */
+       for (i = 0; i < thrd_lists->size(); i++) {
+               /* Iterate over actions in thread, starting from most recent */
+               action_list_t *list = &(*thrd_lists)[i];
+               action_list_t::reverse_iterator rit;
+               ModelAction *lastact=NULL;
+
+               /* Find last action that happens after curr */
+               for (rit = list->rbegin(); rit != list->rend(); rit++) {
+                       ModelAction *act = *rit;
+                       if (curr->happens_before(act)) {
+                               lastact=act;
+                       } else
+                               break;
+               }
+
+                       /* Include at most one act per-thread that "happens before" curr */
+               if (lastact!=NULL) {
+                       if (lastact->is_read()) {
+                               const ModelAction * postreadfrom=lastact->get_reads_from();
+                               if (postreadfrom!=NULL&&rf!=postreadfrom)
+                                       cyclegraph->addEdge(postreadfrom, rf);
+                       } else if (rf!=lastact) {
+                               cyclegraph->addEdge(lastact, rf);
+                       }
+                       break;
+               }
+       }
+}
+
 /**
  * Updates the cyclegraph with the constraints imposed from the current write.
  * @param curr The current action. Must be a write.
@@ -452,7 +489,7 @@ void ModelChecker::w_modification_order(ModelAction * curr) {
                                                 (1) did not happen before us
                                                 (2) is a read and we are a write
                                                 (3) cannot synchronize with us
-                                                (4) is in a different thread 
+                                                (4) is in a different thread
                                                 =>
                                                 that read could potentially read from our write.
                                        */
@@ -541,6 +578,7 @@ void ModelChecker::resolve_promises(ModelAction *write) {
                        ModelAction * read=promise->get_action();
                        read->read_from(write);
                        r_modification_order(read, write);
+                       post_r_modification_order(read, write);
                        promises->erase(promises->begin()+promise_index);
                } else
                        promise_index++;
@@ -616,7 +654,7 @@ void ModelChecker::build_reads_from_past(ModelAction *curr)
                action_list_t::reverse_iterator rit;
                for (rit = list->rbegin(); rit != list->rend(); rit++) {
                        ModelAction *act = *rit;
-                       
+
                        /* Only consider 'write' actions */
                        if (!act->is_write())
                                continue;
@@ -668,7 +706,7 @@ static void print_list(action_list_t *list)
        printf("---------------------------------------------------------------------\n");
 }
 
-void ModelChecker::print_summary(void)
+void ModelChecker::print_summary(bool feasible)
 {
        printf("\n");
        printf("Number of executions: %d\n", num_executions);
@@ -676,7 +714,7 @@ void ModelChecker::print_summary(void)
 
        scheduler->print();
 
-       if (!isfinalfeasible())
+       if (!feasible)
                printf("INFEASIBLE EXECUTION!\n");
        print_list(action_trace);
        printf("\n");