X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=6c9779497e71f96e0621b37e762fbb199bd0556c;hb=9a416eb64865be1728786eb65b1c4b995cfa194d;hp=b391645b3af7a458e9271fc1bd60d762c5935605;hpb=fa47e498d6eb6a97d25bc255df1c08bf66bc4c40;p=model-checker.git diff --git a/nodestack.h b/nodestack.h index b391645..6c97794 100644 --- a/nodestack.h +++ b/nodestack.h @@ -10,6 +10,7 @@ #include #include "threads.h" #include "mymemory.h" +#include "clockvector.h" class ModelAction; @@ -26,6 +27,12 @@ typedef enum { PROMISE_FULFILLED /**< This promise is applicable and fulfilled */ } promise_t; +struct future_value { + uint64_t value; + modelclock_t expiration; +}; + + /** * @brief A single node in a NodeStack * @@ -55,8 +62,9 @@ public: * occurred previously in the stack. */ Node * get_parent() const { return parent; } - bool add_future_value(uint64_t value); + bool add_future_value(uint64_t value, modelclock_t expiration); uint64_t get_future_value(); + modelclock_t get_future_value_expiration(); bool increment_future_value(); bool future_value_empty(); @@ -92,7 +100,7 @@ private: unsigned int read_from_index; - std::vector< uint64_t, MyAlloc< uint64_t > > future_values; + std::vector< struct future_value, MyAlloc > future_values; std::vector< promise_t, MyAlloc > promises; unsigned int future_index; };