fun issues...

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 990f559cc5af67fd368d5355bb890fc975a2c13d..19143d36d4f433c5c734652fbd8fe7ae35a51853 100644 (file)
--- a/model.h
+++ b/model.h
@@ -60,6 +60,7 @@ public:
        void add_thread(Thread *t);
        void remove_thread(Thread *t);
        Thread * get_thread(thread_id_t tid) { return thread_map->get(id_to_int(tid)); }
+       Thread * get_thread(ModelAction *act) { return get_thread(act->get_tid()); }
 
        thread_id_t get_next_id();
        int get_num_threads();
@@ -101,12 +102,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);
@@ -177,6 +180,7 @@ private:
         */
        CycleGraph *mo_graph;
        bool failed_promise;
+       bool too_many_reads;
        bool asserted;
 };