model: pull scheduler's thread selection into get_next_thread()

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 99a93cdc9fd3e33dad9cbc5a4ef21954354c1191..cc4fe284abed1c197682986f9faa4b375f8b6a88 100644 (file)
--- a/model.h
+++ b/model.h
@@ -117,6 +117,7 @@ public:
        unsigned int get_num_threads() const;
        Thread * get_current_thread() const;
 
+       void switch_from_master(Thread *thread);
        uint64_t switch_to_master(ModelAction *act);
        ClockVector * get_cv(thread_id_t tid) const;
        ModelAction * get_parent_action(thread_id_t tid) const;
@@ -148,7 +149,6 @@ private:
        modelclock_t get_next_seq_num();
 
        bool next_execution();
-       void set_current_action(ModelAction *act);
        ModelAction * check_current_action(ModelAction *curr);
        bool initialize_curr_action(ModelAction **curr);
        bool process_read(ModelAction *curr, bool second_part_of_rmw);
@@ -160,7 +160,7 @@ private:
        bool read_from(ModelAction *act, const ModelAction *rf);
        bool check_action_enabled(ModelAction *curr);
 
-       bool take_step(ModelAction *curr);
+       Thread * take_step(ModelAction *curr);
 
        void check_recency(ModelAction *curr, const ModelAction *rf);
        ModelAction * get_last_conflict(ModelAction *act);