X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=e260f083c80a9455cabf4f0c23c3d30e0c9ccb1c;hb=7921811e8bd7bba2cdd892434a58ec7254ae0f99;hp=0a9422572eb0c4bd3ae6ce18b96757c57281a29f;hpb=90471233ff4dcca9a196152574dca4e7cf183698;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index 0a94225..e260f08 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -5,13 +5,13 @@
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
-#include <vector>
 #include <cstddef>
 #include <inttypes.h>
 
 #include "mymemory.h"
 #include "schedule.h"
 #include "promise.h"
+#include "stl-model.h"
 
 class ModelAction;
 class Thread;
@@ -22,11 +22,18 @@ struct fairness_info {
 	bool priority;
 };
 
+/**
+ * @brief Types of read-from relations
+ *
+ * Our "may-read-from" set is composed of multiple types of reads, and we have
+ * to iterate through all of them in the backtracking search. This enumeration
+ * helps to identify which type of read-from we are currently observing.
+ */
 typedef enum {
-	READ_FROM_PAST,
-	READ_FROM_PROMISE,
-	READ_FROM_FUTURE,
-	READ_FROM_NONE,
+	READ_FROM_PAST, /**< @brief Read from a prior, existing store */
+	READ_FROM_PROMISE, /**< @brief Read from an existing promised future value */
+	READ_FROM_FUTURE, /**< @brief Read from a newly-asserted future value */
+	READ_FROM_NONE, /**< @brief A NULL state, which should not be reached */
 } read_from_type_t;
 
 #define YIELD_E 1
@@ -64,6 +71,9 @@ public:
 	enabled_type_t enabled_status(thread_id_t tid) const;
 
 	ModelAction * get_action() const { return action; }
+	void set_uninit_action(ModelAction *act) { uninit_action = act; }
+	ModelAction * get_uninit_action() const { return uninit_action; }
+
 	bool has_priority(thread_id_t tid) const;
 	void update_yield(Scheduler *);
 	bool has_priority_over(thread_id_t tid, thread_id_t tid2) const;
@@ -109,6 +119,8 @@ public:
 	bool increment_relseq_break();
 	bool relseq_break_empty() const;
 
+	bool increment_behaviors();
+
 	void print() const;
 
 	MEMALLOC
@@ -124,11 +136,15 @@ private:
 	read_from_type_t read_from_status;
 
 	ModelAction * const action;
+
+	/** @brief ATOMIC_UNINIT action which was created at this Node */
+	ModelAction *uninit_action;
+
 	Node * const parent;
 	const int num_threads;
-	std::vector< bool, ModelAlloc<bool> > explored_children;
-	std::vector< bool, ModelAlloc<bool> > backtrack;
-	std::vector< struct fairness_info, ModelAlloc< struct fairness_info> > fairness;
+	ModelVector<bool> explored_children;
+	ModelVector<bool> backtrack;
+	ModelVector<struct fairness_info> fairness;
 	int numBacktracks;
 	enabled_type_t *enabled_array;
 
@@ -136,19 +152,19 @@ private:
 	 * The set of past ModelActions that this the action at this Node may
 	 * read from. Only meaningful if this Node represents a 'read' action.
 	 */
-	std::vector< const ModelAction *, ModelAlloc< const ModelAction * > > read_from_past;
+	ModelVector<const ModelAction *> read_from_past;
 	unsigned int read_from_past_idx;
 
-	std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > read_from_promises;
+	ModelVector<const ModelAction *> read_from_promises;
 	int read_from_promise_idx;
 
-	std::vector< struct future_value, ModelAlloc<struct future_value> > future_values;
+	ModelVector<struct future_value> future_values;
 	int future_index;
 
-	std::vector< bool, ModelAlloc<bool> > resolve_promise;
+	ModelVector<bool> resolve_promise;
 	int resolve_promise_idx;
 
-	std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > relseq_break_writes;
+	ModelVector<const ModelAction *> relseq_break_writes;
 	int relseq_break_index;
 
 	int misc_index;
@@ -156,7 +172,7 @@ private:
 	int * yield_data;
 };
 
-typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
+typedef ModelVector<Node *> node_list_t;
 
 /**
  * @brief A stack of nodes