X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=promise.h;h=ea40df0112b183b515258877af1ce20cb606b30d;hb=6b87c110fbda87ccec4f58b1e292d5f9434c8691;hp=fda00cc508229221e5965ea3c752443d503bb1ca;hpb=ac06a98f90fe5c333cd8628e72e11f532c0c6444;p=model-checker.git

diff --git a/promise.h b/promise.h
index fda00cc..ea40df0 100644
--- a/promise.h
+++ b/promise.h
@@ -6,22 +6,43 @@
 
 #ifndef __PROMISE_H__
 #define __PROMISE_H__
-#include <inttypes.h>
 
+#include <inttypes.h>
+#include "threads-model.h"
 
-class ModelAction;
+#include "model.h"
 
 class Promise {
  public:
-	Promise(ModelAction * act, uint64_t value);
-	ModelAction * get_action() { return read; }
-	int increment_threads() { return ++numthreads; }
-	uint64_t get_value() { return value; }
+ 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; }
+	void set_write(const ModelAction *act) { write = act; }
+	const ModelAction * get_write() { return write; }
 
+	SNAPSHOTALLOC
  private:
-	uint64_t value;
-	ModelAction *read;
-	unsigned int numthreads;
+	std::vector<bool> synced_thread;
+	const uint64_t value;
+	const modelclock_t expiration;
+	ModelAction * const read;
+	const ModelAction * write;
 };
 
 #endif