X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=6cd8cfd30806c7463d6710e5251041bf4b64cd81;hb=bd893aac350f125dc990f0ccd32b8e3cf133e2fb;hp=4162ff748e778bf8affcd0ad4fb23aef910f46cd;hpb=6ec6d90066682d8849af174e531e4e0d547ebab3;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index 4162ff7..6cd8cfd 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -10,12 +10,28 @@
 #include <cstddef>
 #include "threads.h"
 #include "mymemory.h"
+#include "clockvector.h"
 
 class ModelAction;
 
-typedef std::vector< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
-typedef std::vector< uint64_t, MyAlloc< uint64_t > > futurevalues_t;
-typedef std::vector< uint32_t, MyAlloc< uint32_t > > promises_t;
+/**
+ * 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;
+};
+
 
 /**
  * @brief A single node in a NodeStack
@@ -28,7 +44,7 @@ typedef std::vector< uint32_t, MyAlloc< uint32_t > > promises_t;
  */
 class Node {
 public:
-	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1);
+	Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, bool *enabled_array = NULL);
 	~Node();
 	/* return true = thread choice has already been explored */
 	bool has_been_explored(thread_id_t tid);
@@ -46,20 +62,23 @@ public:
 	 * 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();
-	bool increment_future_values();
-	bool futurevalues_empty();
+	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 readsfrom_empty();
+	bool read_from_empty();
+	int get_read_from_size();
+	const ModelAction * get_read_from_at(int i);
 
-	void set_promise(uint32_t i);
-	bool get_promise(uint32_t i);
-	bool increment_promises();
-	bool promises_empty();
+	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();
@@ -74,14 +93,16 @@ private:
 	std::vector< bool, MyAlloc<bool> > explored_children;
 	std::vector< bool, MyAlloc<bool> > backtrack;
 	int numBacktracks;
+	bool *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. */
-	readfrom_set_t may_read_from;
+	std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+
 	unsigned int read_from_index;
 
-	futurevalues_t future_values;
-	promises_t promises;
+	std::vector< struct future_value, MyAlloc<struct future_value> > future_values;
+	std::vector< promise_t, MyAlloc<promise_t> > promises;
 	unsigned int future_index;
 };
 
@@ -99,7 +120,7 @@ class NodeStack {
 public:
 	NodeStack();
 	~NodeStack();
-	ModelAction * explore_action(ModelAction *act);
+	ModelAction * explore_action(ModelAction *act, bool * enabled);
 	Node * get_head();
 	Node * get_next();
 	void reset_execution();