bugfix - add stl-model.h wrappers, to provide more control over STL

[c11tester.git] / promise.h

diff --git a/promise.h b/promise.h
index d729e0309868846425d0c439962187b7aa83de44..90ec1d2050bc650b714eebe8f64f5aabde0de7e0 100644 (file)
--- a/promise.h
+++ b/promise.h
@@ -9,21 +9,59 @@
 
 #include <inttypes.h>
 
+#include "modeltypes.h"
+#include "mymemory.h"
+#include "stl-model.h"
+
 class ModelAction;
 
+struct future_value {
+       uint64_t value;
+       modelclock_t expiration;
+       thread_id_t tid;
+};
+
 class Promise {
  public:
-       Promise(ModelAction *act, uint64_t value) :
-               value(value), read(act), numthreads(1)
-       { }
-       ModelAction * get_action() const { return read; }
-       int increment_threads() { return ++numthreads; }
-       uint64_t get_value() const { return value; }
+       Promise(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 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; }
+       bool is_compatible(const ModelAction *act) const;
+       bool is_compatible_exclusive(const ModelAction *act) const;
+       bool same_value(const ModelAction *write) const;
+       bool same_location(const ModelAction *act) const;
+
+       modelclock_t get_expiration() const { return fv.expiration; }
+       uint64_t get_value() const { return fv.value; }
+       struct future_value get_fv() const { return fv; }
+
+       void print() const;
 
+       bool equals(const Promise *x) const { return this == x; }
+       bool equals(const ModelAction *x) const { return false; }
+
+       SNAPSHOTALLOC
  private:
-       const uint64_t value;
-       ModelAction * const read;
-       unsigned int numthreads;
+       /** @brief Thread ID(s) for thread(s) that potentially can satisfy this
+        *  promise */
+       SnapVector<bool> available_thread;
+
+       int num_available_threads;
+
+       const future_value fv;
+
+       /** @brief The action(s) which read the promised future value */
+       SnapVector<ModelAction *> readers;
+
+       const ModelAction *write;
 };
 
 #endif