X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.h;h=e040e169e83e1657f53230c107f7805b8416fc2e;hb=00b14c0561d3838aeb798d3c22f4136f8c4d136b;hp=9ddaea8d6dbfb296f187df94f47141a6cf0376f4;hpb=14e0cf70049e2f98019b66559baccbd5c29554c4;p=model-checker.git

diff --git a/promise.h b/promise.h
index 9ddaea8..e040e16 100644
--- a/promise.h
+++ b/promise.h
@@ -11,37 +11,55 @@
 #include "threads-model.h"
 
 #include "model.h"
+#include "modeltypes.h"
+
+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)
+	Promise(ModelAction *read, struct future_value fv) :
+		num_available_threads(0),
+		value(fv.value),
+		expiration(fv.expiration),
+		read(read),
+		write(NULL)
 	{
-		increment_threads(act->get_tid());
+		add_thread(fv.tid);
+		eliminate_thread(read->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();
+	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;
 	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 *write) const;
+
+	void print() const;
 
 	SNAPSHOTALLOC
  private:
-	std::vector<bool> synced_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;
+
+	const ModelAction *write;
 };
 
 #endif