X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.h;h=5b0e356bc6873238765577cab957977dc8c8a143;hb=dc9c89654982c64264dfee7b1ea23e9a5e88e18e;hp=11719fc3b2c291307f61e9480205265436ca7b48;hpb=00a4dfc8e9c23117e8e4490be5354f7d95ad73e9;p=model-checker.git

diff --git a/promise.h b/promise.h
index 11719fc..5b0e356 100644
--- a/promise.h
+++ b/promise.h
@@ -8,25 +8,53 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
+#include <vector>
+
+#include "modeltypes.h"
+#include "mymemory.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;}
+	Promise(ModelAction *read, struct future_value fv);
 	ModelAction * get_action() const { return read; }
-	int increment_threads() { return ++numthreads; }
-	uint64_t get_value() const { return value; }
+	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;
+
+	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;
 
 	SNAPSHOTALLOC
  private:
-	const uint64_t value;
-	const modelclock_t expiration;
+	/** @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 future_value fv;
+
+	/** @brief The action which reads a promised value */
 	ModelAction * const read;
-	unsigned int numthreads;
+
+	const ModelAction *write;
 };
 
 #endif