X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=0a9422572eb0c4bd3ae6ce18b96757c57281a29f;hb=fa36db2da01d7da10e0cd375fda3c2db4ce3a05b;hp=8a20c45cb2c03e53bdeaf53ee8e80a89b3882014;hpb=7bd9b5a1446863dc1a9de9683476f5a480dfba91;p=model-checker.git
diff --git a/nodestack.h b/nodestack.h
index 8a20c45..0a94225 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;
@@ -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
*
@@ -74,6 +65,8 @@ public:
ModelAction * get_action() const { return 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 +84,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 +114,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;
@@ -146,14 +143,17 @@ 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;
int misc_index;
int misc_max;
+ int * yield_data;
};
typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;