model: fully utilize Promise nodes in CycleGraph

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 4f139878ce00300f4252c1705537deabd7643a5f..f8c2bc867946dc255b0cf2946e9c8f85c422b4d2 100644 (file)
--- a/model.h
+++ b/model.h
@@ -67,7 +67,8 @@ struct execution_stats {
 };
 
 struct PendingFutureValue {
-       ModelAction *writer;
+       PendingFutureValue(ModelAction *writer, ModelAction *act) : writer(writer), act(act) { }
+       const ModelAction *writer;
        ModelAction *act;
 };
 
@@ -101,13 +102,13 @@ public:
 
        void print_summary() const;
 #if SUPPORT_MOD_ORDER_DUMP
-       void dumpGraph(char *filename);
+       void dumpGraph(char *filename) const;
 #endif
 
        void add_thread(Thread *t);
        void remove_thread(Thread *t);
        Thread * get_thread(thread_id_t tid) const;
-       Thread * get_thread(ModelAction *act) const;
+       Thread * get_thread(const ModelAction *act) const;
 
        bool is_enabled(Thread *t) const;
        bool is_enabled(thread_id_t tid) const;
@@ -116,11 +117,11 @@ public:
        unsigned int get_num_threads() const;
        Thread * get_current_thread() const;
 
-       int switch_to_master(ModelAction *act);
+       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);
+       void mo_check_promises(thread_id_t tid, const ModelAction *write, const ModelAction * read);
        void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector *merge_cv);
        bool isfeasibleprefix() const;
 
@@ -148,7 +149,7 @@ private:
 
        bool next_execution();
        void set_current_action(ModelAction *act);
-       Thread * check_current_action(ModelAction *curr);
+       ModelAction * check_current_action(ModelAction *curr);
        bool initialize_curr_action(ModelAction **curr);
        bool process_read(ModelAction *curr, bool second_part_of_rmw);
        bool process_write(ModelAction *curr);
@@ -159,12 +160,13 @@ private:
        bool read_from(ModelAction *act, const ModelAction *rf);
        bool check_action_enabled(ModelAction *curr);
 
-       bool take_step();
+       bool take_step(ModelAction *curr);
 
        void check_recency(ModelAction *curr, const ModelAction *rf);
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
        Thread * get_next_thread(ModelAction *curr);
+       bool set_latest_backtrack(ModelAction *act);
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
        bool resolve_promises(ModelAction *curr);
@@ -180,12 +182,15 @@ 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);
-       bool r_modification_order(ModelAction *curr, const ModelAction *rf);
+
+       template <typename rf_type>
+       bool r_modification_order(ModelAction *curr, const rf_type *rf);
+
        bool w_modification_order(ModelAction *curr);
        void get_release_seq_heads(ModelAction *acquire, ModelAction *read, rel_heads_list_t *release_heads);
        bool release_seq_heads(const ModelAction *rf, rel_heads_list_t *release_heads, struct release_seq *pending) const;
        bool resolve_release_sequences(void *location, work_queue_t *work_queue);
+       void add_future_value(const ModelAction *writer, ModelAction *reader);
 
        ModelAction * new_uninitialized_action(void *location) const;
 
@@ -252,8 +257,8 @@ private:
        struct execution_stats stats;
        void record_stats();
 
+       void print_infeasibility(const char *prefix) const;
        bool is_feasible_prefix_ignore_relseq() const;
-       bool is_infeasible_ignoreRMW() const;
        bool is_infeasible() const;
        bool is_deadlocked() const;
        bool is_complete_execution() const;