model: check data races during release sequence fixup

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 1fcb8fc0a2ab34b375d7c905e0f32c81699afef8..08ea3294b3b963b63ec8d63f3d1a88a39dc7b728 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -602,6 +602,10 @@ void ModelChecker::process_relseq_fixup(ModelAction *curr, work_queue_t *work_qu
                mo_graph->addEdge(release, write);
                mo_graph->addEdge(write, rf);
        }
+
+       /* See if we have realized a data race */
+       if (checkDataRaces())
+               set_assert();
 }
 
 /**
@@ -1334,6 +1338,8 @@ bool ModelChecker::release_seq_heads(const ModelAction *rf,
                                th->is_complete())
                        future_ordered = true;
 
+               ASSERT(!th->is_model_thread() || future_ordered);
+
                for (rit = list->rbegin(); rit != list->rend(); rit++) {
                        const ModelAction *act = *rit;
                        /* Reach synchronization -> this thread is complete */
@@ -1971,9 +1977,16 @@ bool ModelChecker::take_step() {
        DEBUG("(%d, %d)\n", curr ? id_to_int(curr->get_id()) : -1,
                        next ? id_to_int(next->get_id()) : -1);
 
-       /* When no more threads, or when execution replay chooses the
-        * 'model_thread': launch end-of-execution release sequence fixups */
-       if (!pending_rel_seqs->empty() && (!next || next->is_model_thread())) {
+       /*
+        * Launch end-of-execution release sequence fixups only when there are:
+        *
+        * (1) no more user threads to run (or when execution replay chooses
+        *     the 'model_thread')
+        * (2) pending release sequences
+        * (3) pending assertions (i.e., data races)
+        */
+       if (!pending_rel_seqs->empty() && (!next || next->is_model_thread()) &&
+                       !unrealizedraces.empty()) {
                printf("*** WARNING: release sequence fixup action (%zu pending release seuqences) ***\n",
                                pending_rel_seqs->size());
                ModelAction *fixup = new ModelAction(MODEL_FIXUP_RELSEQ,