X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=promise.h;h=90ec1d2050bc650b714eebe8f64f5aabde0de7e0;hp=83198b27758ffffa4f783986f2f1125e7c654c48;hb=5ea8e3d5d861ed363e5ac5f3b20b8181dd197efb;hpb=1bc8782b55cab0503f1b64529f993f0b9e3a1846

diff --git a/promise.h b/promise.h
index 83198b27..90ec1d20 100644
--- a/promise.h
+++ b/promise.h
@@ -9,23 +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, modelclock_t expiration) :
-	value(value), expiration(expiration), read(act), numthreads(1)
-	{ }
-	modelclock_t get_expiration() const {return expiration;}
-	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;
-	const modelclock_t expiration;
-	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