X-Git-Url: http://plrg.eecs.uci.edu/git/?p=c11tester.git;a=blobdiff_plain;f=nodestack.h;h=47c72678aa13cffb9294e6a7d842860136e37baf;hp=648ef4dfc318afc38a4e98b1e31bf4a1bcc944eb;hb=1ef66fffe44c297326b1043cab978789b1071704;hpb=79f51bf7df7ed2c8095b0c2d7f730db6ccb9394a

diff --git a/nodestack.h b/nodestack.h
index 648ef4df..47c72678 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -5,14 +5,13 @@
 #ifndef __NODESTACK_H__
 #define __NODESTACK_H__
 
-#include <list>
 #include <vector>
 #include <cstddef>
 #include <inttypes.h>
 
 #include "mymemory.h"
-#include "modeltypes.h"
 #include "schedule.h"
+#include "promise.h"
 
 class ModelAction;
 class Thread;
@@ -24,16 +23,14 @@ class Thread;
  * <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;
-};
+
+#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 fairness_info {
 	unsigned int enabled_count;
@@ -41,7 +38,6 @@ struct fairness_info {
 	bool priority;
 };
 
-
 /**
  * @brief A single node in a NodeStack
  *
@@ -53,67 +49,66 @@ struct fairness_info {
  */
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 2, Node *prevfairness = NULL);
+	Node(ModelAction *act, Node *par, int nthreads, Node *prevfairness);
 	~Node();
 	/* return true = thread choice has already been explored */
-	bool has_been_explored(thread_id_t tid);
+	bool has_been_explored(thread_id_t tid) const;
 	/* return true = backtrack set is empty */
-	bool backtrack_empty();
+	bool backtrack_empty() const;
 
-	void explore_child(ModelAction *act, enabled_type_t * is_enabled);
+	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);
-	bool is_enabled(thread_id_t tid);
-	enabled_type_t enabled_status(thread_id_t tid);
+	bool is_enabled(Thread *t) const;
+	bool is_enabled(thread_id_t tid) const;
+	enabled_type_t enabled_status(thread_id_t tid) const;
 
-	ModelAction * get_action() { return action; }
-	bool has_priority(thread_id_t tid);
-	int get_num_threads() {return num_threads;}
+	ModelAction * get_action() const { return action; }
+	bool has_priority(thread_id_t tid) const;
+	int get_num_threads() const { 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 add_future_value(struct future_value& fv);
+	struct future_value get_future_value() const;
 	bool increment_future_value();
-	bool future_value_empty();
+	bool future_value_empty() const;
 
 	void add_read_from(const ModelAction *act);
-	const ModelAction * get_read_from();
+	const ModelAction * get_read_from() const;
 	bool increment_read_from();
-	bool read_from_empty();
-	int get_read_from_size();
-	const ModelAction * get_read_from_at(int i);
+	bool read_from_empty() const;
+	int get_read_from_size() const;
+	const ModelAction * get_read_from_at(int i) const;
 
-	void set_promise(unsigned int i);
-	bool get_promise(unsigned int i);
+	void set_promise(unsigned int i, bool is_rmw);
+	bool get_promise(unsigned int i) const;
 	bool increment_promise();
-	bool promise_empty();
+	bool promise_empty() const;
 	enabled_type_t *get_enabled_array() {return enabled_array;}
 
 	void set_misc_max(int i);
-	int get_misc();
+	int get_misc() const;
 	bool increment_misc();
-	bool misc_empty();
+	bool misc_empty() const;
 
 	void add_relseq_break(const ModelAction *write);
-	const ModelAction * get_relseq_break();
+	const ModelAction * get_relseq_break() const;
 	bool increment_relseq_break();
-	bool relseq_break_empty();
+	bool relseq_break_empty() const;
 
-	void print();
+	void print() const;
 	void print_may_read_from();
 
 	MEMALLOC
 private:
 	void explore(thread_id_t tid);
 
-	ModelAction *action;
-	Node *parent;
-	int num_threads;
+	ModelAction * const 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;
@@ -152,18 +147,25 @@ public:
 	NodeStack();
 	~NodeStack();
 	ModelAction * explore_action(ModelAction *act, enabled_type_t * is_enabled);
-	Node * get_head();
-	Node * get_next();
+	Node * get_head() const;
+	Node * get_next() const;
 	void reset_execution();
 	void pop_restofstack(int numAhead);
 	int get_total_nodes() { return total_nodes; }
 
-	void print();
+	void print() const;
 
 	MEMALLOC
 private:
 	node_list_t node_list;
-	unsigned int iter;
+
+	/**
+	 * @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;
 
 	int total_nodes;
 };