X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.h;h=5b0e356bc6873238765577cab957977dc8c8a143;hb=dc9c89654982c64264dfee7b1ea23e9a5e88e18e;hp=8a0ac590665e4454b22017ab516b5aad27c1f730;hpb=8cebf02d9a4c9f0fe80af04f6276f4978f3b93f5;p=model-checker.git

diff --git a/promise.h b/promise.h
index 8a0ac59..5b0e356 100644
--- a/promise.h
+++ b/promise.h
@@ -8,48 +8,52 @@
 #define __PROMISE_H__
 
 #include <inttypes.h>
-#include "threads-model.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, struct future_value fv) :
-		value(fv.value),
-		expiration(fv.expiration),
-		read(act),
-		write(NULL)
-	{
-		eliminate_thread(act->get_tid());
-	}
-	modelclock_t get_expiration() const { return expiration; }
+	Promise(ModelAction *read, struct future_value fv);
 	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;
+	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 *act) const;
+	bool is_compatible_exclusive(const ModelAction *act) const;
 
-	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];
-	}
+	modelclock_t get_expiration() const { return fv.expiration; }
+	uint64_t get_value() const { return fv.value; }
+	struct future_value get_fv() const { return fv; }
 
-	bool check_promise() const;
-	uint64_t get_value() const { return value; }
-	void set_write(const ModelAction *act) { write = act; }
-	const ModelAction * get_write() { return write; }
+	void print() const;
 
 	SNAPSHOTALLOC
  private:
-	std::vector<bool> synced_thread;
-	const uint64_t value;
-	const modelclock_t expiration;
+	/** @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 which reads a promised value */
 	ModelAction * const read;
+
 	const ModelAction *write;
 };