X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=promise.h;h=20aee036f99c3a6adad194b353846a524404ef1e;hp=7e6e396e15f9330e24ed7590e6abaefc9f3b1c38;hb=1ef66fffe44c297326b1043cab978789b1071704;hpb=b329a1b8e97612d269dd8c888750b88d7278182f

diff --git a/promise.h b/promise.h
index 7e6e396e..20aee036 100644
--- a/promise.h
+++ b/promise.h
@@ -16,33 +16,41 @@
 struct future_value {
 	uint64_t value;
 	modelclock_t expiration;
+	thread_id_t tid;
 };
 
 class Promise {
  public:
-	Promise(ModelAction *act, struct future_value fv) :
-		value(fv.value),
-		expiration(fv.expiration),
-		read(act),
-		write(NULL)
-	{
-		eliminate_thread(act->get_tid());
-	}
+	Promise(ModelAction *read, struct future_value fv);
 	modelclock_t get_expiration() const { return expiration; }
 	ModelAction * get_action() const { return read; }
 	bool eliminate_thread(thread_id_t tid);
-	bool thread_is_eliminated(thread_id_t tid) const;
+	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() { return write; }
+	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;
+
+	void print() const;
 
 	SNAPSHOTALLOC
  private:
-	std::vector< bool, SnapshotAlloc<bool> > eliminated_thread;
+	/** @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;
 };