fix mistake in promises may allow code... need to be even more aggressive about fv

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 4b87b04a48a00263b9377c8e3b82549228e329f9..355764b7c4d290cfb3de64f7f0c0086a0ba83c73 100644 (file)
--- a/model.h
+++ b/model.h
@@ -73,9 +73,11 @@ struct execution_stats {
 };
 
 struct PendingFutureValue {
-       PendingFutureValue(ModelAction *writer, ModelAction *act) : writer(writer), act(act) { }
+       PendingFutureValue(ModelAction *writer, ModelAction *reader) :
+               writer(writer), reader(reader)
+       { }
        const ModelAction *writer;
-       ModelAction *act;
+       ModelAction *reader;
 };
 
 /** @brief Records information regarding a single pending release sequence */
@@ -144,8 +146,9 @@ private:
        void add_thread(Thread *t);
 
        bool sleep_can_read_from(ModelAction *curr, const ModelAction *write);
-       bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader);
+       bool thin_air_constraint_may_allow(const ModelAction *writer, const ModelAction *reader) const;
        bool mo_may_allow(const ModelAction *writer, const ModelAction *reader);
+       bool promises_may_allow(const ModelAction *writer, const ModelAction *reader) const;
        bool has_asserted() const;
        void set_assert();
        void set_bad_synchronization();
@@ -183,8 +186,8 @@ private:
        bool set_latest_backtrack(ModelAction *act);
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
-       int get_promise_to_resolve(const ModelAction *curr) const;
-       bool resolve_promise(ModelAction *curr, unsigned int promise_idx);
+       Promise * pop_promise_to_resolve(const ModelAction *curr);
+       bool resolve_promise(ModelAction *curr, Promise *promise);
        void compute_promises(ModelAction *curr);
        void compute_relseq_breakwrites(ModelAction *curr);