(1) structure code a little better

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 00982130b042f16add374761d180f717a51900a7..cc464a2bcc5b76b933d8769ba450486b4804edbf 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -272,6 +272,8 @@ bool ModelChecker::process_read(ModelAction *curr, Thread * th, bool second_part
        while(true) {
                const ModelAction *reads_from = curr->get_node()->get_read_from();
                if (reads_from != NULL) {
+                       mo_graph->startChanges();
+
                        value = reads_from->get_value();
                                /* Assign reads_from, perform release/acquire synchronization */
                        curr->read_from(reads_from);
@@ -292,8 +294,9 @@ bool ModelChecker::process_read(ModelAction *curr, Thread * th, bool second_part
                } else {
                        /* Read from future value */
                        value = curr->get_node()->get_future_value();
+                       modelclock_t expiration = curr->get_node()->get_future_value_expiration();
                        curr->read_from(NULL);
-                       Promise *valuepromise = new Promise(curr, value);
+                       Promise *valuepromise = new Promise(curr, value, expiration);
                        promises->push_back(valuepromise);
                }
                th->set_return_value(value);
@@ -411,21 +414,36 @@ Thread * ModelChecker::check_current_action(ModelAction *curr)
        if (!second_part_of_rmw)
                add_action_to_lists(curr);
 
+       check_curr_backtracking(curr);
+       
+       set_backtracking(curr);
+
+       return get_next_thread(curr);
+}
+
+void ModelChecker::check_curr_backtracking(ModelAction * curr) {
        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())
-                   && (!priv->next_backtrack ||
-                       *curr > *priv->next_backtrack)) {
+                        !currnode->read_from_empty() ||
+                        !currnode->future_value_empty() ||
+                        !currnode->promise_empty())
+                       && (!priv->next_backtrack ||
+                                       *curr > *priv->next_backtrack)) {
                priv->next_backtrack = curr;
        }
+}
 
-       set_backtracking(curr);
 
-       return get_next_thread(curr);
+bool ModelChecker::promises_expired() {
+       for (unsigned int promise_index = 0; promise_index < promises->size(); promise_index++) {
+               Promise *promise = (*promises)[promise_index];
+               if (promise->get_expiration()<priv->used_sequence_numbers) {
+                       return true;
+               }
+       }
+       return false;
 }
 
 /** @returns whether the current partial trace must be a prefix of a
@@ -436,7 +454,7 @@ bool ModelChecker::isfeasibleprefix() {
 
 /** @returns whether the current partial trace is feasible. */
 bool ModelChecker::isfeasible() {
-       return !mo_graph->checkForCycles() && !failed_promise && !too_many_reads;
+       return !mo_graph->checkForCycles() && !failed_promise && !too_many_reads && !promises_expired();
 }
 
 /** Returns whether the current completed trace is feasible. */
@@ -518,6 +536,7 @@ void ModelChecker::check_recency(ModelAction *curr, bool already_added) {
                                continue;
 
                        /* Test to see whether this is a feasible write to read from*/
+                       mo_graph->startChanges();
                        r_modification_order(curr, write);
                        bool feasiblereadfrom=isfeasible();
                        mo_graph->rollbackChanges();
@@ -685,7 +704,7 @@ bool ModelChecker::w_modification_order(ModelAction *curr)
                                   =>
                                   that read could potentially read from our write.
                                 */
-                               if (isfeasible() && act->get_node()->add_future_value(curr->get_value()) &&
+                               if (isfeasible() && act->get_node()->add_future_value(curr->get_value(), curr->get_seq_number()+params.maxfuturedelay) &&
                                                (!priv->next_backtrack || *act > *priv->next_backtrack))
                                        priv->next_backtrack = act;
                        }