X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=986b9c9df4be85f15d57cbf13f46d62626a3c35d;hb=c2d7fa973e562c194eb732d8dc58ab7659b7a2ee;hp=1dfccfcb7b9cc268d7cfab5b3aada4df8205b4d7;hpb=ffc110b3aaa80564dbf85f3c6a9049efd40571f1;p=model-checker.git
diff --git a/nodestack.h b/nodestack.h
index 1dfccfc..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,7 +91,7 @@ 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();