Merge branch 'master' of ssh://demsky.eecs.uci.edu/home/git/model-checker

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 412543dbeba356d3839c66cc422ff1487fa659eb..71b8b7ac0b97b2dcf4990de667f2418f29c41d94 100644 (file)
--- a/model.h
+++ b/model.h
@@ -38,6 +38,7 @@ typedef std::list< ModelAction *, SnapshotAlloc<ModelAction *> > action_list_t;
 struct model_params {
        int maxreads;
        int maxfuturedelay;
+       bool yieldon;
        unsigned int fairwindow;
        unsigned int enabledcount;
        unsigned int bound;
@@ -167,11 +168,17 @@ 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);
-       Thread * get_next_thread(ModelAction *curr);
+       Thread * action_select_next_thread(const ModelAction *curr) const;
+       Thread * get_next_thread();
        bool set_latest_backtrack(ModelAction *act);
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
@@ -271,6 +278,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;