X-Git-Url: http://plrg.eecs.uci.edu/git/?p=cdsspec-compiler.git;a=blobdiff_plain;f=promise.h;h=84d5aa49b3af7b8156ef4744e270f128c6a0cabf;hp=ea40df0112b183b515258877af1ce20cb606b30d;hb=4f0f0dbbeb4a965ac5fb8e6e30d8fcc1cd99eff6;hpb=202542965363285e68bb33654a62fe816c69b176

diff --git a/promise.h b/promise.h
index ea40df0..84d5aa4 100644
--- a/promise.h
+++ b/promise.h
@@ -8,41 +8,67 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
-#include "threads-model.h"
 
-#include "model.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, 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];
-	}
-
-	bool check_promise();
-	uint64_t get_value() const { 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;
+	unsigned int max_available_thread_idx() 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; }
+
+	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:
-	std::vector<bool> synced_thread;
-	const uint64_t value;
-	const modelclock_t expiration;
-	ModelAction * const read;
-	const ModelAction * write;
+	/** @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;
+
+	int num_available_threads;
+
+	const future_value fv;
+
+	/** @brief The action(s) which read the promised future value */
+	SnapVector<ModelAction *> readers;
+
+	const ModelAction *write;
 };
 
 #endif