X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=fc566d6dde8fd65561888899c3505babd79804b0;hb=e356dc963edf27f8a97b1ae3d39e276723aa5968;hp=8a20c45cb2c03e53bdeaf53ee8e80a89b3882014;hpb=7bd9b5a1446863dc1a9de9683476f5a480dfba91;p=model-checker.git
diff --git a/nodestack.h b/nodestack.h
index 8a20c45..fc566d6 100644
--- a/nodestack.h
+++ b/nodestack.h
@@ -16,22 +16,6 @@
class ModelAction;
class Thread;
-/**
- * A flag used for the promise counting/combination problem within a node,
- * denoting whether a particular Promise is
- *
- @b applicable: can be satisfied by this Node's ModelAction and
- * - @b fulfilled: satisfied by this Node's ModelAction under the current
- * configuration.
- */
-
-#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;
@@ -96,10 +80,12 @@ public:
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);
@@ -146,9 +132,11 @@ private:
int read_from_promise_idx;
std::vector< struct future_value, ModelAlloc > future_values;
- std::vector< promise_t, ModelAlloc > promises;
int future_index;
+ std::vector< bool, ModelAlloc > resolve_promise;
+ int resolve_promise_idx;
+
std::vector< const ModelAction *, ModelAlloc > relseq_break_writes;
int relseq_break_index;