model: factor out a 'switch_from_master()' function

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 6685ab365c64179ff91c303cf19b8fd709da05c4..cc4fe284abed1c197682986f9faa4b375f8b6a88 100644 (file)
--- a/model.h
+++ b/model.h
@@ -117,11 +117,12 @@ 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;
        void check_promises_thread_disabled();
-       void mo_check_promises(thread_id_t tid, const ModelAction *write, const ModelAction * read);
+       void mo_check_promises(const ModelAction *act, bool is_read_check);
        void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
        bool isfeasibleprefix() 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);
@@ -182,7 +182,6 @@ private:
        ModelAction * get_last_unlock(ModelAction *curr) const;
        void build_reads_from_past(ModelAction *curr);
        ModelAction * process_rmw(ModelAction *curr);
-       void post_r_modification_order(ModelAction *curr, const ModelAction *rf);
 
        template <typename rf_type>
        bool r_modification_order(ModelAction *curr, const rf_type *rf);