model: add promise-node edges for 'read' actions

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index e39266d41218feecb14d4fde94701c22cd2040d3..15f1831627e0621896fadc3638ec27e6814cfc07 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -735,10 +735,13 @@ bool ModelChecker::process_read(ModelAction *curr, bool second_part_of_rmw)
                } else if (!second_part_of_rmw) {
                        /* Read from future value */
                        struct future_value fv = curr->get_node()->get_future_value();
+                       Promise *promise = new Promise(curr, fv);
                        value = fv.value;
-                       curr->set_value(fv.value);
-                       curr->set_read_from(NULL);
-                       promises->push_back(new Promise(curr, fv));
+                       curr->set_read_from_promise(promise);
+                       promises->push_back(promise);
+                       mo_graph->startChanges();
+                       updated = r_modification_order(curr, promise);
+                       mo_graph->commitChanges();
                }
                get_thread(curr)->set_return_value(value);
                return updated;
@@ -1304,8 +1307,14 @@ ModelAction * ModelChecker::check_current_action(ModelAction *curr)
 
                        if (act->is_read()) {
                                const ModelAction *rf = act->get_reads_from();
-                               if (rf != NULL && r_modification_order(act, rf))
-                                       updated = true;
+                               const Promise *promise = act->get_reads_from_promise();
+                               if (rf) {
+                                       if (r_modification_order(act, rf))
+                                               updated = true;
+                               } else if (promise) {
+                                       if (r_modification_order(act, promise))
+                                               updated = true;
+                               }
                        }
                        if (act->is_write()) {
                                if (w_modification_order(act))
@@ -1521,7 +1530,7 @@ void ModelChecker::check_recency(ModelAction *curr, const ModelAction *rf)
  * read.
  *
  * Basic idea is the following: Go through each other thread and find
- * the lastest action that happened before our read.  Two cases:
+ * the last action that happened before our read.  Two cases:
  *
  * (1) The action is a write => that write must either occur before
  * the write we read from or be the write we read from.
@@ -1530,10 +1539,11 @@ void ModelChecker::check_recency(ModelAction *curr, const ModelAction *rf)
  * must occur before the write we read from or be the same write.
  *
  * @param curr The current action. Must be a read.
- * @param rf The action that curr reads from. Must be a write.
+ * @param rf The ModelAction or Promise that curr reads from. Must be a write.
  * @return True if modification order edges were added; false otherwise
  */
-bool ModelChecker::r_modification_order(ModelAction *curr, const ModelAction *rf)
+template <typename rf_type>
+bool ModelChecker::r_modification_order(ModelAction *curr, const rf_type *rf)
 {
        std::vector<action_list_t> *thrd_lists = get_safe_ptr_vect_action(obj_thrd_map, curr->get_location());
        unsigned int i;
@@ -1561,7 +1571,7 @@ bool ModelChecker::r_modification_order(ModelAction *curr, const ModelAction *rf
                for (rit = list->rbegin(); rit != list->rend(); rit++) {
                        ModelAction *act = *rit;
 
-                       if (act->is_write() && act != rf && act != curr) {
+                       if (act->is_write() && !act->equals(rf) && act != curr) {
                                /* C++, Section 29.3 statement 5 */
                                if (curr->is_seqcst() && last_sc_fence_thread_local &&
                                                *act < *last_sc_fence_thread_local) {
@@ -1591,7 +1601,7 @@ bool ModelChecker::r_modification_order(ModelAction *curr, const ModelAction *rf
                         */
                        if (act->happens_before(curr) && act != curr) {
                                if (act->is_write()) {
-                                       if (rf != act) {
+                                       if (!act->equals(rf)) {
                                                mo_graph->addEdge(act, rf);
                                                added = true;
                                        }
@@ -1601,7 +1611,7 @@ bool ModelChecker::r_modification_order(ModelAction *curr, const ModelAction *rf
                                        if (prevreadfrom == NULL)
                                                continue;
 
-                                       if (rf != prevreadfrom) {
+                                       if (!prevreadfrom->equals(rf)) {
                                                mo_graph->addEdge(prevreadfrom, rf);
                                                added = true;
                                        }