X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.h;h=e306e14a261aafe8d38b0753524cd194dfc730f0;hb=refs%2Fheads%2Fmaster;hp=e8c233c61d8240d4820fc39ad7d735d0ffeff355;hpb=cb7d648c3c1c3d916c7fc60a7cb332eb2b52d510;p=model-checker.git diff --git a/promise.h b/promise.h index e8c233c..e306e14 100644 --- a/promise.h +++ b/promise.h @@ -14,6 +14,7 @@ #include "stl-model.h" class ModelAction; +class ModelExecution; struct future_value { uint64_t value; @@ -23,17 +24,20 @@ struct future_value { class Promise { public: - Promise(ModelAction *read, struct future_value fv); + Promise(const ModelExecution *execution, ModelAction *read, struct future_value fv); bool add_reader(ModelAction *reader); ModelAction * get_reader(unsigned int i) const; unsigned int get_num_readers() const { return readers.size(); } bool eliminate_thread(thread_id_t tid); void add_thread(thread_id_t tid); bool thread_is_available(thread_id_t tid) const; + bool thread_was_available(thread_id_t tid) const; + unsigned int max_available_thread_idx() const; bool has_failed() const; void set_write(const ModelAction *act) { write = act; } const ModelAction * get_write() const { return write; } int get_num_available_threads() const { return num_available_threads; } + int get_num_was_available_threads() const { return num_was_available_threads; } bool is_compatible(const ModelAction *act) const; bool is_compatible_exclusive(const ModelAction *act) const; bool same_value(const ModelAction *write) const; @@ -52,11 +56,16 @@ class Promise { SNAPSHOTALLOC private: + /** @brief The execution which created this Promise */ + const ModelExecution *execution; + /** @brief Thread ID(s) for thread(s) that potentially can satisfy this * promise */ SnapVector available_thread; + SnapVector was_available_thread; int num_available_threads; + int num_was_available_threads; const future_value fv;