X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=nodestack.h;h=9ccde8da34e953052660292d6b865cb53dbe76e0;hp=eebfa5ba1c0c8c4771bb625e490fb6dbfeb97c16;hb=5e4a7d161cba81152ddcf295ee72fbb25ba3afaa;hpb=ee410adc01be424c3e5e28f273153afd66a49a83

diff --git a/nodestack.h b/nodestack.h
index eebfa5ba..9ccde8da 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -1,3 +1,7 @@
+/** @file nodestack.h
+ *  @brief Stack of operations for use in backtracking.
+*/
+
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
@@ -9,14 +13,28 @@
 
 class ModelAction;
 
+typedef std::vector< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
+typedef std::vector< uint64_t, MyAlloc< uint64_t > > futurevalues_t;
+
+/**
+ * @brief A single node in a NodeStack
+ *
+ * Represents a single node in the NodeStack. Each Node is associated with up
+ * to one action and up to one parent node. A node holds information
+ * regarding the last action performed (the "associated action"), the thread
+ * choices that have been explored (explored_children) and should be explored
+ * (backtrack), and the actions that the last action may read from.
+ */
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *parent = NULL);
+	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1);
 	~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();
+	bool readsfrom_empty();
+	bool futurevalues_empty();
 	void explore_child(ModelAction *act);
 	/* return false = thread was already in backtrack */
 	bool set_backtrack(thread_id_t id);
@@ -24,23 +42,50 @@ public:
 	bool is_enabled(Thread *t);
 	ModelAction * get_action() { return action; }
 
-	void print();
+	/** @return the parent Node to this Node; that is, the action that
+	 * occurred previously in the stack. */
+	Node * get_parent() const { return parent; }
+
+	bool add_future_value(uint64_t value);
+	void add_read_from(const ModelAction *act);
+	const ModelAction * get_read_from();
+	uint64_t get_future_value();
+	bool increment_read_from();
+	bool increment_future_values();
 
-	static int get_total_nodes() { return total_nodes; }
+	void print();
+	void print_may_read_from();
 
 	MEMALLOC
 private:
 	void explore(thread_id_t tid);
 
-	static int total_nodes;
 	ModelAction *action;
+	Node *parent;
 	int num_threads;
 	std::vector< bool, MyAlloc<bool> > explored_children;
 	std::vector< bool, MyAlloc<bool> > backtrack;
+	int numBacktracks;
+
+	/** The set of ModelActions that this the action at this Node may read
+	 *  from. Only meaningful if this Node represents a 'read' action. */
+	readfrom_set_t may_read_from;
+	unsigned int read_from_index;
+
+	futurevalues_t future_values;
+	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
+ *
+ * Holds a Node linked-list that can be used for holding backtracking,
+ * may-read-from, and replay information. It is used primarily as a
+ * stack-like structure, in that backtracking points and replay nodes are
+ * only removed from the top (most recent).
+ */
 class NodeStack {
 public:
 	NodeStack();
@@ -49,6 +94,8 @@ public:
 	Node * get_head();
 	Node * get_next();
 	void reset_execution();
+	void pop_restofstack(int numAhead);
+	int get_total_nodes() { return total_nodes; }
 
 	void print();
 
@@ -56,6 +103,8 @@ public:
 private:
 	node_list_t node_list;
 	node_list_t::iterator iter;
+
+	int total_nodes;
 };
 
 #endif /* __NODESTACK_H__ */