X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.h;h=0adc3de1aabb47d9d8df7a007d59eb09f391a257;hb=443fd91df4ad9b88d5ec88a29f80008911b4a917;hp=2ce3e297305125baa0a057da571cf266965b916e;hpb=c832cb55af09e735821ae3463bc37c29d3fa27c8;p=c11tester.git

diff --git a/promise.h b/promise.h
index 2ce3e297..0adc3de1 100644
--- a/promise.h
+++ b/promise.h
@@ -8,40 +8,60 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
-#include "threads.h"
+#include <vector>
 
-#include "model.h"
+#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), write(NULL)
-	{ 
-		increment_threads(act->get_tid());
-	}
-	modelclock_t get_expiration() const {return expiration;}
-	ModelAction * get_action() const { return read; }
-	bool increment_threads(thread_id_t tid);
-
-	bool has_sync_thread(thread_id_t tid) { 
-		unsigned int id=id_to_int(tid); 
-		if (id>=synced_thread.size()) {
-			return false;
-		}
-		return synced_thread[id];
-	}
-
-	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() { 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;
+	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:
-	std::vector<bool> synced_thread;
-	const uint64_t value;
-	const modelclock_t expiration;
-	ModelAction * const read;
-	const ModelAction * write;
+	/** @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(s) which read the promised future value */
+	std::vector< ModelAction *, SnapshotAlloc<ModelAction *> > readers;
+
+	const ModelAction *write;
 };
 
 #endif