X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=986b9c9df4be85f15d57cbf13f46d62626a3c35d;hb=dc83c88bb4917edbc9ad07f1ab942172fab72a72;hp=b440b11d58e3242b359a45be8fdac52267c99726;hpb=379bbd92e88f756e39883dbac98c68b1d0699a66;p=c11tester.git

diff --git a/nodestack.h b/nodestack.h
index b440b11d..986b9c9d 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -8,10 +8,14 @@
 #include <list>
 #include <vector>
 #include <cstddef>
-#include "threads.h"
+#include <inttypes.h>
+
 #include "mymemory.h"
+#include "modeltypes.h"
+#include "schedule.h"
 
 class ModelAction;
+class Thread;
 
 /**
  * A flag used for the promise counting/combination problem within a node,
@@ -20,11 +24,26 @@ class ModelAction;
  * <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;
+
+#define	PROMISE_IGNORE 0 /**< This promise is inapplicable; ignore it */
+#define	PROMISE_UNFULFILLED 1 /**< This promise is applicable but unfulfilled */
+#define	PROMISE_FULFILLED 2 /**< This promise is applicable and fulfilled */
+#define PROMISE_MASK 0xf
+#define PROMISE_RMW 0x10
+
+typedef int promise_t;
+
+struct future_value {
+	uint64_t value;
+	modelclock_t expiration;
+};
+
+struct fairness_info {
+	unsigned int enabled_count;
+	unsigned int turns;
+	bool priority;
+};
+
 
 /**
  * @brief A single node in a NodeStack
@@ -37,26 +56,31 @@ typedef enum {
  */
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1);
+	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 2, Node *prevfairness = 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);
+	void explore_child(ModelAction *act, enabled_type_t * is_enabled);
 	/* return false = thread was already in backtrack */
 	bool set_backtrack(thread_id_t id);
 	thread_id_t get_next_backtrack();
 	bool is_enabled(Thread *t);
-	ModelAction * get_action() { return action; }
+	bool is_enabled(thread_id_t tid);
+	enabled_type_t enabled_status(thread_id_t tid);
 
+	ModelAction * get_action() { return action; }
+	bool has_priority(thread_id_t tid);
+	int get_num_threads() {return num_threads;}
 	/** @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);
+	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();
 
@@ -64,11 +88,24 @@ public:
 	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);
+	void set_promise(unsigned int i, bool is_rmw);
 	bool get_promise(unsigned int i);
 	bool increment_promise();
 	bool promise_empty();
+	enabled_type_t *get_enabled_array() {return enabled_array;}
+
+	void set_misc_max(int i);
+	int get_misc();
+	bool increment_misc();
+	bool misc_empty();
+
+	void add_relseq_break(const ModelAction *write);
+	const ModelAction * get_relseq_break();
+	bool increment_relseq_break();
+	bool relseq_break_empty();
 
 	void print();
 	void print_may_read_from();
@@ -80,22 +117,30 @@ private:
 	ModelAction *action;
 	Node *parent;
 	int num_threads;
-	std::vector< bool, MyAlloc<bool> > explored_children;
-	std::vector< bool, MyAlloc<bool> > backtrack;
+	std::vector< bool, ModelAlloc<bool> > explored_children;
+	std::vector< bool, ModelAlloc<bool> > backtrack;
+	std::vector< struct fairness_info, ModelAlloc< struct fairness_info> > fairness;
 	int numBacktracks;
+	enabled_type_t *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. */
-	std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+	std::vector< const ModelAction *, ModelAlloc< const ModelAction * > > may_read_from;
 
 	unsigned int read_from_index;
 
-	std::vector< uint64_t, MyAlloc< uint64_t > > future_values;
-	std::vector< promise_t, MyAlloc<promise_t> > promises;
-	unsigned int future_index;
+	std::vector< struct future_value, ModelAlloc<struct future_value> > future_values;
+	std::vector< promise_t, ModelAlloc<promise_t> > promises;
+	int future_index;
+
+	std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > relseq_break_writes;
+	int relseq_break_index;
+
+	int misc_index;
+	int misc_max;
 };
 
-typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
+typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
 
 /**
  * @brief A stack of nodes
@@ -109,7 +154,7 @@ class NodeStack {
 public:
 	NodeStack();
 	~NodeStack();
-	ModelAction * explore_action(ModelAction *act);
+	ModelAction * explore_action(ModelAction *act, enabled_type_t * is_enabled);
 	Node * get_head();
 	Node * get_next();
 	void reset_execution();
@@ -121,7 +166,7 @@ public:
 	MEMALLOC
 private:
 	node_list_t node_list;
-	node_list_t::iterator iter;
+	unsigned int iter;
 
 	int total_nodes;
 };