X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=99374a351bc6525b9c8f5131bcaad00761e1b0bf;hb=bee1e27429b9a66e414eb83cf14e2089dd40a79e;hp=8a20c45cb2c03e53bdeaf53ee8e80a89b3882014;hpb=7bd9b5a1446863dc1a9de9683476f5a480dfba91;p=model-checker.git

diff --git a/nodestack.h b/nodestack.h
index 8a20c45..99374a3 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -5,33 +5,17 @@
 #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;
 
-/**
- * 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>
- */
-
-#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;
 	unsigned int turns;
@@ -45,6 +29,13 @@ typedef enum {
 	READ_FROM_NONE,
 } read_from_type_t;
 
+#define YIELD_E 1
+#define YIELD_D 2
+#define YIELD_S 4
+#define YIELD_P 8
+#define YIELD_INDEX(tid1, tid2, num_threads) (tid1*num_threads+tid2)
+
+
 /**
  * @brief A single node in a NodeStack
  *
@@ -73,7 +64,12 @@ 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;
 	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. */
@@ -91,15 +87,19 @@ public:
 	int get_read_from_past_size() const;
 
 	void add_read_from_promise(const ModelAction *reader);
-	const Promise * get_read_from_promise() const;
+	Promise * get_read_from_promise() const;
+	Promise * get_read_from_promise(int i) const;
+	int get_read_from_promise_size() const;
 
 	bool add_future_value(struct future_value fv);
 	struct future_value get_future_value() const;
 
-	void set_promise(unsigned int i, bool is_rmw);
+	void set_promise(unsigned int i);
 	bool get_promise(unsigned int i) const;
 	bool increment_promise();
 	bool promise_empty() const;
+	void clear_promise_resolutions();
+
 	enabled_type_t *get_enabled_array() {return enabled_array;}
 
 	void set_misc_max(int i);
@@ -117,7 +117,7 @@ public:
 	MEMALLOC
 private:
 	void explore(thread_id_t tid);
-
+	int get_yield_data(int tid1, int tid2) const;
 	bool read_from_past_empty() const;
 	bool increment_read_from_past();
 	bool read_from_promise_empty() const;
@@ -127,11 +127,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;
 
@@ -139,24 +143,27 @@ 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;
-	std::vector< promise_t, ModelAlloc<promise_t> > promises;
+	ModelVector<struct future_value> future_values;
 	int future_index;
 
-	std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > relseq_break_writes;
+	ModelVector<bool> resolve_promise;
+	int resolve_promise_idx;
+
+	ModelVector<const ModelAction *> relseq_break_writes;
 	int relseq_break_index;
 
 	int misc_index;
 	int misc_max;
+	int * yield_data;
 };
 
-typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
+typedef ModelVector<Node *> node_list_t;
 
 /**
  * @brief A stack of nodes