X-Git-Url: http://plrg.eecs.uci.edu/git/?p=model-checker.git;a=blobdiff_plain;f=promise.h;h=e306e14a261aafe8d38b0753524cd194dfc730f0;hp=0bf62d6b6a6bb1358383cd772ac0c5c9cd6d04a0;hb=6014243b7130f34b7ffd1098da225b0b8de5c328;hpb=6ec6d90066682d8849af174e531e4e0d547ebab3

diff --git a/promise.h b/promise.h
index 0bf62d6..e306e14 100644
--- a/promise.h
+++ b/promise.h
@@ -6,22 +6,73 @@
 
 #ifndef __PROMISE_H__
 #define __PROMISE_H__
+
 #include <inttypes.h>
 
+#include "modeltypes.h"
+#include "mymemory.h"
+#include "stl-model.h"
 
 class ModelAction;
+class ModelExecution;
+
+struct future_value {
+	uint64_t value;
+	modelclock_t expiration;
+	thread_id_t tid;
+};
 
 class Promise {
  public:
-	Promise(ModelAction * act, uint64_t value);
-	const ModelAction * get_action() { return read; }
-	int increment_threads() { return ++numthreads; }
-	uint64_t get_value() { return value; }
-	
+	Promise(const ModelExecution *execution, 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 thread_was_available(thread_id_t tid) const;
+	unsigned int max_available_thread_idx() 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; }
+	int get_num_was_available_threads() const { return num_was_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; }
+
+	int get_index() const;
+
+	void print() const;
+
+	bool equals(const Promise *x) const { return this == x; }
+	bool equals(const ModelAction *x) const { return false; }
+
+	SNAPSHOTALLOC
  private:
-	uint64_t value;
-	ModelAction *read;
-	unsigned int numthreads;
+	/** @brief The execution which created this Promise */
+	const ModelExecution *execution;
+
+	/** @brief Thread ID(s) for thread(s) that potentially can satisfy this
+	 *  promise */
+	SnapVector<bool> available_thread;
+	SnapVector<bool> was_available_thread;
+
+	int num_available_threads;
+	int num_was_available_threads;
+
+	const future_value fv;
+
+	/** @brief The action(s) which read the promised future value */
+	SnapVector<ModelAction *> readers;
+
+	const ModelAction *write;
 };
 
 #endif