Fix snapshot code

[model-checker.git] / promise.h

diff --git a/promise.h b/promise.h
index 90ec1d2050bc650b714eebe8f64f5aabde0de7e0..e306e14a261aafe8d38b0753524cd194dfc730f0 100644 (file)
--- 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;
@@ -43,6 +47,8 @@ class Promise {
        uint64_t get_value() const { return fv.value; }
        struct future_value get_fv() const { return fv; }
 
+       int get_index() const;
+
        void print() const;
 
        bool equals(const Promise *x) const { return this == x; }
@@ -50,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<bool> available_thread;
+       SnapVector<bool> was_available_thread;
 
        int num_available_threads;
+       int num_was_available_threads;
 
        const future_value fv;