fix some of the bugs related to barrier example...

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 8316f04bd7aef32986f3d54f31dd1ca8afdca090..01dd35b03752504dc9416543f38588018297adf6 100644 (file)
--- a/model.h
+++ b/model.h
@@ -36,11 +36,11 @@ struct model_params {
        int maxfuturedelay;
        unsigned int fairwindow;
        unsigned int enabledcount;
+       unsigned int bound;
 };
 
 struct PendingFutureValue {
-       uint64_t value;
-       modelclock_t expiration;
+       ModelAction *writer;
        ModelAction * act;
 };
 
@@ -120,6 +120,7 @@ private:
 
        bool sleep_can_read_from(ModelAction * curr, const ModelAction *write);
        bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
+       bool mo_may_allow(const ModelAction * writer, const ModelAction *reader);
        bool has_asserted() {return asserted;}
        void reset_asserted() {asserted=false;}
        int num_executions;
@@ -169,7 +170,6 @@ private:
        bool w_modification_order(ModelAction *curr);
        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 do_complete_join(ModelAction *join);
 
        ModelAction *diverge;
        ModelAction *earliest_diverge;