another bug fix...

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index bcb9d61a5e6d02e317a9428395b451b7e6285aec..d47fe9677a78c57b0c6a8da46ac774b7749a7ef2 100644 (file)
--- a/model.h
+++ b/model.h
@@ -75,11 +75,11 @@ public:
        ModelAction * get_parent_action(thread_id_t tid);
        bool next_execution();
        bool isfeasible();
+       bool isfeasibleotherthanRMW();
        bool isfinalfeasible();
        void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
        void get_release_seq_heads(ModelAction *act,
                        std::vector<const ModelAction *> *release_heads);
-
        void finish_execution();
        bool isfeasibleprefix();
        void set_assert() {asserted=true;}
@@ -88,7 +88,11 @@ public:
 private:
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler *scheduler;
+       
+       bool ensure_rmw_acyclic(const ModelAction * read, const ModelAction *write);
+
 
+       bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
        bool has_asserted() {return asserted;}
        void reset_asserted() {asserted=false;}
        int num_executions;
@@ -185,6 +189,7 @@ private:
        bool failed_promise;
        bool too_many_reads;
        bool asserted;
+       bool rmw_cycle;
 };
 
 extern ModelChecker *model;