model: rename check_deadlock() to is_circular_wait()

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 3f4ca001aa8c85d85564cf012d10bf37b6182614..ae668b159cb04d701ff151f099b96c85ae2452a0 100644 (file)
--- a/model.h
+++ b/model.h
@@ -167,10 +167,11 @@ private:
 
        Thread * take_step(ModelAction *curr);
 
-       bool check_recency(ModelAction *curr, const ModelAction *rf) const;
-
        template <typename T>
-       bool should_read_instead(const ModelAction *curr, const ModelAction *rf, const T *other_rf) const;
+       bool check_recency(ModelAction *curr, const T *rf) const;
+
+       template <typename T, typename U>
+       bool should_read_instead(const ModelAction *curr, const T *rf, const U *other_rf) const;
 
        ModelAction * get_last_fence_conflict(ModelAction *act) const;
        ModelAction * get_last_conflict(ModelAction *act) const;
@@ -275,6 +276,7 @@ private:
        bool is_feasible_prefix_ignore_relseq() const;
        bool is_infeasible() const;
        bool is_deadlocked() const;
+       bool is_circular_wait(const Thread *t) const;
        bool is_complete_execution() const;
        bool have_bug_reports() const;
        void print_bugs() const;