Merge branch 'demsky'

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 70ec80427a7e7a0995defb0978e6025e49b4143a..c3e5830211c9276ec7b5004504fbb9472df32069 100644 (file)
--- a/model.h
+++ b/model.h
@@ -101,13 +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);