model: add improved (?) deadlock detection

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 412543dbeba356d3839c66cc422ff1487fa659eb..0cbff4ce36bad6148bb22a6d6d40a5bf4cf7a1a1 100644 (file)
--- a/model.h
+++ b/model.h
@@ -167,7 +167,12 @@ private:
 
        Thread * take_step(ModelAction *curr);
 
-       void check_recency(ModelAction *curr, const ModelAction *rf);
+       template <typename T>
+       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;
        void set_backtracking(ModelAction *act);
@@ -271,6 +276,7 @@ private:
        bool is_feasible_prefix_ignore_relseq() const;
        bool is_infeasible() const;
        bool is_deadlocked() const;
+       bool check_deadlock(const Thread *t) const;
        bool is_complete_execution() const;
        bool have_bug_reports() const;
        void print_bugs() const;