Merge branch 'demsky'

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index b2f7897a310f7dc66fa88ce970893c43c252059c..c3e5830211c9276ec7b5004504fbb9472df32069 100644 (file)
--- a/model.h
+++ b/model.h
@@ -28,6 +28,7 @@ class Promise;
  * the model checker.
  */
 struct model_params {
+       int maxreads;
 };
 
 /**
@@ -100,12 +101,14 @@ private:
         */
        void set_current_action(ModelAction *act) { priv->current_action = act; }
        Thread * check_current_action(ModelAction *curr);
+       bool process_read(ModelAction *curr, Thread * th, bool second_part_of_rmw);
 
        bool take_step();
 
+       void check_recency(ModelAction *curr, bool already_added);
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
-       Thread * get_next_replay_thread();
+       Thread * get_next_thread(ModelAction *curr);
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
        bool resolve_promises(ModelAction *curr);
@@ -176,6 +179,7 @@ private:
         */
        CycleGraph *mo_graph;
        bool failed_promise;
+       bool too_many_reads;
        bool asserted;
 };