X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.h;h=178b86e7d4b3cedba32f2240f2493e63655efb4d;hb=5236e7a4403ccc6d28b3fdc746c5710d6190310a;hp=fda00cc508229221e5965ea3c752443d503bb1ca;hpb=ac06a98f90fe5c333cd8628e72e11f532c0c6444;p=model-checker.git

diff --git a/promise.h b/promise.h
index fda00cc..178b86e 100644
--- a/promise.h
+++ b/promise.h
@@ -6,22 +6,61 @@
 
 #ifndef __PROMISE_H__
 #define __PROMISE_H__
+
 #include <inttypes.h>
+#include "threads-model.h"
 
+#include "model.h"
+#include "modeltypes.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);
-	ModelAction * get_action() { return read; }
-	int increment_threads() { return ++numthreads; }
-	uint64_t get_value() { return value; }
+	Promise(ModelAction *read, struct future_value fv) :
+		num_available_threads(0),
+		value(fv.value),
+		expiration(fv.expiration),
+		read(read),
+		write(NULL)
+	{
+		add_thread(fv.tid);
+		eliminate_thread(read->get_tid());
+	}
+	modelclock_t get_expiration() const { return expiration; }
+	ModelAction * get_action() const { return read; }
+	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;
+	uint64_t get_value() const { return value; }
+	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 *write) const;
+	bool is_compatible_exclusive(const ModelAction *write) const;
 
+	void print() const;
+
+	SNAPSHOTALLOC
  private:
-	uint64_t value;
-	ModelAction *read;
-	unsigned int numthreads;
+	/** @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 uint64_t value;
+	const modelclock_t expiration;
+
+	/** @brief The action which reads a promised value */
+	ModelAction * const read;
+
+	const ModelAction *write;
 };
 
 #endif