forgot about events that happen after an unresolved read... bug fix checked in

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 41ec97b50bdb71744075d0216a4bb209813255a9..4a55c52b5e9f2ac637b952f12598d7374ccb561f 100644 (file)
--- a/model.h
+++ b/model.h
@@ -57,6 +57,8 @@ public:
        ClockVector * get_cv(thread_id_t tid);
        bool next_execution();
        bool isfeasible();
+       bool isfinalfeasible();
+       void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
        MEMALLOC
 private:
@@ -77,6 +79,8 @@ private:
        thread_id_t get_next_replay_thread();
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
+       void resolve_promises(ModelAction *curr);
+       void compute_promises(ModelAction *curr);
 
        void add_action_to_lists(ModelAction *act);
        ModelAction * get_last_action(thread_id_t tid);
@@ -84,10 +88,10 @@ private:
        ModelAction * get_last_seq_cst(const void *location);
        void build_reads_from_past(ModelAction *curr);
        ModelAction * process_rmw(ModelAction * curr);
+       void post_r_modification_order(ModelAction * curr, const ModelAction *rf);
        void r_modification_order(ModelAction * curr, const ModelAction *rf);
        void w_modification_order(ModelAction * curr);
 
-
        ModelAction *current_action;
        ModelAction *diverge;
        thread_id_t nextThread;
@@ -106,6 +110,7 @@ private:
        NodeStack *node_stack;
        ModelAction *next_backtrack;
        CycleGraph * cyclegraph;
+       bool failed_promise;
 };
 
 extern ModelChecker *model;