promise: move thread_is_eliminated()

[model-checker.git] / promise.h

diff --git a/promise.h b/promise.h
index 83198b27758ffffa4f783986f2f1125e7c654c48..1f8a810ad33e0ab0a3de283eb19bd8f711ea745e 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -8,24 +8,42 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
+#include "threads-model.h"
 
-class ModelAction;
+#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), numthreads(1)
-       { }
-       modelclock_t get_expiration() const {return expiration;}
+       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; }
        ModelAction * get_action() const { return read; }
-       int increment_threads() { return ++numthreads; }
+       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> eliminated_thread;
        const uint64_t value;
        const modelclock_t expiration;
        ModelAction * const read;
-       unsigned int numthreads;
+       const ModelAction *write;
 };
 
 #endif