X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=nodestack.h;h=6cd8cfd30806c7463d6710e5251041bf4b64cd81;hp=79ab19b3ac36fb805b66716a628dbcf389965ae6;hb=160c85908774dfffc19dc1b02f4f845a14c056af;hpb=ad660ce6ce8b50abe7a380f643a5e22fb2b282df

diff --git a/nodestack.h b/nodestack.h
index 79ab19b3..6cd8cfd3 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -7,14 +7,31 @@
 
 #include <list>
 #include <vector>
-#include <set>
 #include <cstddef>
 #include "threads.h"
 #include "mymemory.h"
+#include "clockvector.h"
 
 class ModelAction;
 
-typedef std::set< ModelAction *, std::less< ModelAction *>, MyAlloc< ModelAction * > > action_set_t;
+/**
+ * A flag used for the promise counting/combination problem within a node,
+ * denoting whether a particular Promise is
+ * <ol><li>@b applicable: can be satisfied by this Node's ModelAction and</li>
+ * <li>@b fulfilled: satisfied by this Node's ModelAction under the current
+ * configuration.</li></ol>
+ */
+typedef enum {
+	PROMISE_IGNORE = 0, /**< This promise is inapplicable; ignore it */
+	PROMISE_UNFULFILLED, /**< This promise is applicable but unfulfilled */
+	PROMISE_FULFILLED /**< This promise is applicable and fulfilled */
+} promise_t;
+
+struct future_value {
+	uint64_t value;
+	modelclock_t expiration;
+};
+
 
 /**
  * @brief A single node in a NodeStack
@@ -27,12 +44,13 @@ typedef std::set< ModelAction *, std::less< ModelAction *>, MyAlloc< ModelAction
  */
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1);
+	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, bool *enabled_array = NULL);
 	~Node();
 	/* return true = thread choice has already been explored */
 	bool has_been_explored(thread_id_t tid);
 	/* return true = backtrack set is empty */
 	bool backtrack_empty();
+
 	void explore_child(ModelAction *act);
 	/* return false = thread was already in backtrack */
 	bool set_backtrack(thread_id_t id);
@@ -44,9 +62,26 @@ public:
 	 * occurred previously in the stack. */
 	Node * get_parent() const { return parent; }
 
-	void add_read_from(ModelAction *act);
+	bool add_future_value(uint64_t value, modelclock_t expiration);
+	uint64_t get_future_value();
+	modelclock_t get_future_value_expiration();
+	bool increment_future_value();
+	bool future_value_empty();
+
+	void add_read_from(const ModelAction *act);
+	const ModelAction * get_read_from();
+	bool increment_read_from();
+	bool read_from_empty();
+	int get_read_from_size();
+	const ModelAction * get_read_from_at(int i);
+
+	void set_promise(unsigned int i);
+	bool get_promise(unsigned int i);
+	bool increment_promise();
+	bool promise_empty();
 
 	void print();
+	void print_may_read_from();
 
 	MEMALLOC
 private:
@@ -58,13 +93,20 @@ private:
 	std::vector< bool, MyAlloc<bool> > explored_children;
 	std::vector< bool, MyAlloc<bool> > backtrack;
 	int numBacktracks;
+	bool *enabled_array;
 
 	/** The set of ModelActions that this the action at this Node may read
 	 *  from. Only meaningful if this Node represents a 'read' action. */
-	action_set_t *may_read_from;
+	std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+
+	unsigned int read_from_index;
+
+	std::vector< struct future_value, MyAlloc<struct future_value> > future_values;
+	std::vector< promise_t, MyAlloc<promise_t> > promises;
+	unsigned int future_index;
 };
 
-typedef std::list<class Node *, MyAlloc< class Node * > > node_list_t;
+typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
 
 /**
  * @brief A stack of nodes
@@ -78,11 +120,11 @@ class NodeStack {
 public:
 	NodeStack();
 	~NodeStack();
-	ModelAction * explore_action(ModelAction *act);
+	ModelAction * explore_action(ModelAction *act, bool * enabled);
 	Node * get_head();
 	Node * get_next();
 	void reset_execution();
-
+	void pop_restofstack(int numAhead);
 	int get_total_nodes() { return total_nodes; }
 
 	void print();