fix norris mentioned bug

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 56d86acc98e022bcb65d91cd9a922201b6d5f00f..ee9d2c71280175e4dfe0380380b0839cfaa599f5 100644 (file)
--- a/model.h
+++ b/model.h
@@ -149,6 +149,7 @@ private:
        void set_bad_synchronization();
        bool promises_expired() const;
        void execute_sleep_set();
+       bool should_wake_up(const ModelAction *curr, const Thread *thread) const;
        void wake_up_sleeping_actions(ModelAction *curr);
        modelclock_t get_next_seq_num();
 
@@ -167,6 +168,7 @@ private:
        Thread * take_step(ModelAction *curr);
 
        void check_recency(ModelAction *curr, const ModelAction *rf);
+       ModelAction * get_last_fence_conflict(ModelAction *act) const;
        ModelAction * get_last_conflict(ModelAction *act) const;
        void set_backtracking(ModelAction *act);
        Thread * get_next_thread(ModelAction *curr);
@@ -184,7 +186,7 @@ private:
        ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
        ModelAction * get_last_seq_cst_fence(thread_id_t tid, const ModelAction *before_fence) const;
        ModelAction * get_last_unlock(ModelAction *curr) const;
-       void build_reads_from_past(ModelAction *curr);
+       void build_may_read_from(ModelAction *curr);
        ModelAction * process_rmw(ModelAction *curr);
 
        template <typename rf_type>