X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=986b9c9df4be85f15d57cbf13f46d62626a3c35d;hb=4ee9f33221f490599093e74b527ba7e401133f96;hp=147b0048eb9cb00c82bf82c7855c2fe78a6414b8;hpb=59eb730e1d19a0825008c40eb521bfc5c29df5f9;p=model-checker.git
diff --git a/nodestack.h b/nodestack.h
index 147b004..986b9c9 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -24,11 +24,14 @@ class Thread;
*
@b fulfilled: satisfied by this Node's ModelAction under the current
* configuration.
*/
-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;
@@ -53,7 +56,7 @@ struct fairness_info {
*/
class Node {
public:
- Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, Node *prevfairness = NULL);
+ 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);
@@ -66,6 +69,8 @@ public:
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);
+
ModelAction * get_action() { return action; }
bool has_priority(thread_id_t tid);
int get_num_threads() {return num_threads;}
@@ -86,12 +91,22 @@ public:
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();
@@ -117,6 +132,12 @@ private:
std::vector< struct future_value, ModelAlloc > future_values;
std::vector< promise_t, ModelAlloc > promises;
int future_index;
+
+ std::vector< const ModelAction *, ModelAlloc > relseq_break_writes;
+ int relseq_break_index;
+
+ int misc_index;
+ int misc_max;
};
typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;