cyclegraph: reformat, improve 'addRMWEdge' comments

[model-checker.git] / promise.h

diff --git a/promise.h b/promise.h
index 9fd6552d06bbe3746767376e9ddb270516b4437c..35515d24b2da913b387e5ec06b786a83e3d43877 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -16,44 +16,42 @@
 struct future_value {
        uint64_t value;
        modelclock_t expiration;
+       thread_id_t tid;
 };
 
 class Promise {
  public:
        Promise(ModelAction *act, struct future_value fv) :
+               num_available_threads(0),
                value(fv.value),
                expiration(fv.expiration),
                read(act),
                write(NULL)
        {
+               add_thread(fv.tid);
                eliminate_thread(act->get_tid());
        }
        modelclock_t get_expiration() const { return expiration; }
        ModelAction * get_action() const { return read; }
        bool eliminate_thread(thread_id_t tid);
-
-       /**
-        * Check if a thread has already been eliminated from resolving this
-        * promise
-        * @param tid Thread ID of the thread to check
-        * @return True if the thread is already eliminated; false otherwise
-        */
-       bool thread_is_eliminated(thread_id_t tid) const
-       {
-               unsigned int id = id_to_int(tid);
-               if (id >= eliminated_thread.size())
-                       return false;
-               return eliminated_thread[id];
-       }
-
+       void add_thread(thread_id_t tid);
+       bool thread_is_available(thread_id_t tid) const;
        bool has_failed() const;
        uint64_t get_value() const { return value; }
        void set_write(const ModelAction *act) { write = act; }
        const ModelAction * get_write() { return write; }
+       int get_num_available_threads() { return num_available_threads; }
+
+       void print() const;
 
        SNAPSHOTALLOC
  private:
-       std::vector<bool> eliminated_thread;
+       /** @brief Thread ID(s) for thread(s) that potentially can satisfy this
+        *  promise */
+       std::vector< bool, SnapshotAlloc<bool> > available_thread;
+
+       int num_available_threads;
+
        const uint64_t value;
        const modelclock_t expiration;
        ModelAction * const read;