X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.h;h=c99e0f8b424ddbe8079593713e498e53fe6fb80e;hb=9c42c31b487bf7319dba4d43e417e29420306977;hp=1bd32a1fffcb926449f2b5fc7a11f7d74410cf34;hpb=d96312573c237eb9648976be85de39261c9531c6;p=model-checker.git diff --git a/model.h b/model.h index 1bd32a1..c99e0f8 100644 --- a/model.h +++ b/model.h @@ -39,8 +39,7 @@ struct model_params { }; struct PendingFutureValue { - uint64_t value; - modelclock_t expiration; + ModelAction *writer; ModelAction * act; }; @@ -118,7 +117,9 @@ private: /** The scheduler to use: tracks the running/ready Threads */ Scheduler *scheduler; + 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;