From: Brian Norris <banorris@uci.edu>
Date: Sat, 23 Feb 2013 00:04:51 +0000 (-0800)
Subject: promise: stash the whole future_value
X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=commitdiff_plain;h=084fd1d6e7a9680f3ec48f38c37dda0600ffb612

promise: stash the whole future_value

We may need to generate a new Promise from the same future_value, so
stash the whole struct and expose it via get_fv().
---

diff --git a/promise.cc b/promise.cc
index 0f5ba4d1..86c3c584 100644
--- a/promise.cc
+++ b/promise.cc
@@ -14,8 +14,7 @@
  */
 Promise::Promise(ModelAction *read, struct future_value fv) :
 	num_available_threads(0),
-	value(fv.value),
-	expiration(fv.expiration),
+	fv(fv),
 	read(read),
 	write(NULL)
 {
@@ -77,7 +76,7 @@ bool Promise::thread_is_available(thread_id_t tid) const
 /** @brief Print debug info about the Promise */
 void Promise::print() const
 {
-	model_print("Promised value %#" PRIx64 ", read from thread %d, available threads to resolve: ", value, id_to_int(read->get_tid()));
+	model_print("Promised value %#" PRIx64 ", read from thread %d, available threads to resolve: ", fv.value, id_to_int(read->get_tid()));
 	for (unsigned int i = 0; i < available_thread.size(); i++)
 		if (available_thread[i])
 			model_print("[%d]", i);
diff --git a/promise.h b/promise.h
index 278b7cc2..5b0e356b 100644
--- a/promise.h
+++ b/promise.h
@@ -24,19 +24,21 @@ struct future_value {
 class Promise {
  public:
 	Promise(ModelAction *read, struct future_value fv);
-	modelclock_t get_expiration() const { return expiration; }
 	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;
-	uint64_t get_value() const { return value; }
 	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;
 
+	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;
 
 	SNAPSHOTALLOC
@@ -47,8 +49,7 @@ class Promise {
 
 	int num_available_threads;
 
-	const uint64_t value;
-	const modelclock_t expiration;
+	const future_value fv;
 
 	/** @brief The action which reads a promised value */
 	ModelAction * const read;