X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.h;h=178b86e7d4b3cedba32f2240f2493e63655efb4d;hb=f06cd40fb350723b2dbe59f8c494b03a60f41b40;hp=9fd6552d06bbe3746767376e9ddb270516b4437c;hpb=c49d1c1de40847e0133b61137422005ec1cc69fd;p=c11tester.git

diff --git a/promise.h b/promise.h
index 9fd6552d..178b86e7 100644
--- a/promise.h
+++ b/promise.h
@@ -16,47 +16,50 @@
 struct future_value {
 	uint64_t value;
 	modelclock_t expiration;
+	thread_id_t tid;
 };
 
 class Promise {
  public:
-	Promise(ModelAction *act, struct future_value fv) :
+	Promise(ModelAction *read, struct future_value fv) :
+		num_available_threads(0),
 		value(fv.value),
 		expiration(fv.expiration),
-		read(act),
+		read(read),
 		write(NULL)
 	{
-		eliminate_thread(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 eliminate_thread(thread_id_t tid);
-
-	/**
-	 * Check if a thread has already been eliminated from resolving this
-	 * promise
-	 * @param tid Thread ID of the thread to check
-	 * @return True if the thread is already eliminated; false otherwise
-	 */
-	bool thread_is_eliminated(thread_id_t tid) const
-	{
-		unsigned int id = id_to_int(tid);
-		if (id >= eliminated_thread.size())
-			return false;
-		return eliminated_thread[id];
-	}
-
+	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;
+	bool is_compatible_exclusive(const ModelAction *write) const;
+
+	void print() const;
 
 	SNAPSHOTALLOC
  private:
-	std::vector<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;
 };