merge

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index 35eefa674d43d937799acd8940e00d1b0faf4cc3..922a0d60e6daf360360c83852f70ee7e47f3cf4f 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -266,10 +266,11 @@ bool ModelChecker::is_deadlocked() const
 {
        bool blocking_threads = false;
        for (unsigned int i = 0; i < get_num_threads(); i++) {
-               Thread *t = get_thread(int_to_id(i));
-               if (scheduler->is_enabled(t) != THREAD_DISABLED)
+               thread_id_t tid = int_to_id(i);
+               if (is_enabled(tid))
                        return false;
-               else if (!t->is_model_thread() && t->get_pending())
+               Thread *t = get_thread(tid);
+               if (!t->is_model_thread() && t->get_pending())
                        blocking_threads = true;
        }
        return blocking_threads;
@@ -305,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();
        }
@@ -1556,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;