promise: SnapshotAlloc for vector

[model-checker.git] / promise.h

diff --git a/promise.h b/promise.h
index ea40df0112b183b515258877af1ce20cb606b30d..7e6e396e15f9330e24ed7590e6abaefc9f3b1c38 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -11,38 +11,39 @@
 #include "threads-model.h"
 
 #include "model.h"
+#include "modeltypes.h"
+
+struct future_value {
+       uint64_t value;
+       modelclock_t expiration;
+};
 
 class Promise {
  public:
- Promise(ModelAction *act, uint64_t value, modelclock_t expiration) :
-       value(value), expiration(expiration), read(act), write(NULL)
-       { 
-               increment_threads(act->get_tid());
+       Promise(ModelAction *act, struct future_value fv) :
+               value(fv.value),
+               expiration(fv.expiration),
+               read(act),
+               write(NULL)
+       {
+               eliminate_thread(act->get_tid());
        }
-       modelclock_t get_expiration() const {return expiration;}
+       modelclock_t get_expiration() const { return expiration; }
        ModelAction * get_action() const { return read; }
-       bool increment_threads(thread_id_t tid);
-
-       bool has_sync_thread(thread_id_t tid) { 
-               unsigned int id=id_to_int(tid); 
-               if (id>=synced_thread.size()) {
-                       return false;
-               }
-               return synced_thread[id];
-       }
-
-       bool check_promise();
+       bool eliminate_thread(thread_id_t tid);
+       bool thread_is_eliminated(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; }
 
        SNAPSHOTALLOC
  private:
-       std::vector<bool> synced_thread;
+       std::vector< bool, SnapshotAlloc<bool> > eliminated_thread;
        const uint64_t value;
        const modelclock_t expiration;
        ModelAction * const read;
-       const ModelAction * write;
+       const ModelAction *write;
 };
 
 #endif