threads: move circular wait check into Threads::is_waiting_on

[c11tester.git] / model.cc

diff --git a/model.cc b/model.cc
index 7df70eebbe271c88486a4c85e4289217f1a40e4b..879f1dea17d162b38ca240e4c628043ed00001c3 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -409,22 +409,6 @@ bool ModelChecker::is_deadlocked() const
        return blocking_threads;
 }
 
        return blocking_threads;
 }
 

-/**
- * Check if a Thread has entered a circular wait deadlock situation. This will
- * not check other threads for potential deadlock situations, and may miss
- * deadlocks involving WAIT.
- *
- * @param t The thread which may have entered a deadlock
- * @return True if this Thread entered a deadlock; false otherwise
- */
-bool ModelChecker::is_circular_wait(const Thread *t) const
-{
-       for (Thread *waiting = t->waiting_on() ; waiting != NULL; waiting = waiting->waiting_on())
-               if (waiting == t)
-                       return true;
-       return false;
-}
-

 /**
  * Check if this is a complete execution. That is, have all thread completed
  * execution (rather than exiting because sleep sets have forced a redundant
 /**
  * Check if this is a complete execution. That is, have all thread completed
  * execution (rather than exiting because sleep sets have forced a redundant


@@ -3169,7 +3153,7 @@ void ModelChecker::run()
                                Thread *thr = get_thread(tid);
                                if (!thr->is_model_thread() && !thr->is_complete() && !thr->get_pending()) {
                                        switch_from_master(thr);
                                Thread *thr = get_thread(tid);
                                if (!thr->is_model_thread() && !thr->is_complete() && !thr->get_pending()) {
                                        switch_from_master(thr);

-                                       if (is_circular_wait(thr))
+                                       if (thr->is_waiting_on(thr))

                                                assert_bug("Deadlock detected");
                                }
                        }
                                                assert_bug("Deadlock detected");
                                }
                        }