Merge branch 'master' of /home/git/model-checker

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index daf2d15cf2f3227bedc0abc0094bcfed20d12308..922a0d60e6daf360360c83852f70ee7e47f3cf4f 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -306,7 +306,7 @@ bool ModelChecker::next_execution()
                        pending_rel_seqs->size());
 
 
-       if (isfinalfeasible() || (params.bound != 0 && priv->used_sequence_numbers > params.bound ) || DBG_ENABLED() ) {
+       if (isfinalfeasible() || DBG_ENABLED()) {
                checkDataRaces();
                print_summary();
        }
@@ -1557,7 +1557,7 @@ bool ModelChecker::release_seq_heads(const ModelAction *rf,
                ModelAction *last = get_last_action(int_to_id(i));
                Thread *th = get_thread(int_to_id(i));
                if ((last && rf->happens_before(last)) ||
-                               !scheduler->is_enabled(th) ||
+                               !is_enabled(th) ||
                                th->is_complete())
                        future_ordered = true;