X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=nodestack.h;h=fa356d0e9ae666db61bb993423b7b915df2c815b;hp=1f7d3e4ad3fee660027e974261b8083b3a99e0c3;hb=5881b6573197c0366e2380cf28f78189c3fde312;hpb=c7f10b7c489c0c186bfe34dd1d87ae8b89d501ff

diff --git a/nodestack.h b/nodestack.h
index 1f7d3e4a..fa356d0e 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -1,43 +1,17 @@
 /** @file nodestack.h
  *  @brief Stack of operations for use in backtracking.
-*/
+ */
 
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
-#include <list>
-#include <vector>
 #include <cstddef>
-#include "threads.h"
-#include "mymemory.h"
-#include "clockvector.h"
-
-class ModelAction;
-
-/**
- * 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;
-};
-
-struct fairness_info {
-	unsigned int enabled_count;
-	unsigned int turns;
-	bool priority;
-};
+#include <inttypes.h>
 
+#include "mymemory.h"
+#include "schedule.h"
+#include "stl-model.h"
+#include "classlist.h"
 
 /**
  * @brief A single node in a NodeStack
@@ -50,72 +24,23 @@ struct fairness_info {
  */
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, Node *prevfairness = NULL);
+	Node(ModelAction *act);
 	~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, bool * 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);
-	bool is_enabled(thread_id_t tid);
-	ModelAction * get_action() { return action; }
-	bool has_priority(thread_id_t tid) {return fairness[id_to_int(tid)].priority;}
-	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, 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();
+	ModelAction * get_action() const { return action; }
+	void set_uninit_action(ModelAction *act) { uninit_action = act; }
+	ModelAction * get_uninit_action() const { return uninit_action; }
+	void print() const;
 
 	MEMALLOC
 private:
-	void explore(thread_id_t tid);
-
-	ModelAction *action;
-	Node *parent;
-	int num_threads;
-	std::vector< bool, MyAlloc<bool> > explored_children;
-	std::vector< bool, MyAlloc<bool> > backtrack;
-	std::vector< struct fairness_info, MyAlloc< struct fairness_info> > fairness;
-	int numBacktracks;
-	bool *enabled_array;
+	ModelAction * const action;
 
-	/** 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;
-
-	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;
+	/** @brief ATOMIC_UNINIT action which was created at this Node */
+	ModelAction *uninit_action;
 };
 
-typedef std::vector< Node *, MyAlloc< Node * > > node_list_t;
+typedef ModelVector<Node *> node_list_t;
 
 /**
  * @brief A stack of nodes
@@ -129,21 +54,30 @@ class NodeStack {
 public:
 	NodeStack();
 	~NodeStack();
-	ModelAction * explore_action(ModelAction *act, bool * is_enabled);
-	Node * get_head();
-	Node * get_next();
-	void reset_execution();
-	void pop_restofstack(int numAhead);
-	int get_total_nodes() { return total_nodes; }
 
-	void print();
+	void register_engine(const ModelExecution *exec);
+	ModelAction * explore_action(ModelAction *act);
+	Node * get_head() const;
+	Node * get_next() const;
+	void reset_execution();
+	void full_reset();
+	void print() const;
 
 	MEMALLOC
 private:
 	node_list_t node_list;
-	unsigned int iter;
-
-	int total_nodes;
+	const struct model_params * get_params() const;
+
+	/** @brief The model-checker execution object */
+	const ModelExecution *execution;
+
+	/**
+	 * @brief the index position of the current head Node
+	 *
+	 * This index is relative to node_list. The index should point to the
+	 * current head Node. It is negative when the list is empty.
+	 */
+	int head_idx;
 };
 
-#endif /* __NODESTACK_H__ */
+#endif	/* __NODESTACK_H__ */