X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=nodestack.h;h=44d739c9e9d752565fe76b67b4b49dce4cf778d9;hb=6bca1b36d0e9379014bea4d0b45db410b698b6f6;hp=147b0048eb9cb00c82bf82c7855c2fe78a6414b8;hpb=59eb730e1d19a0825008c40eb521bfc5c29df5f9;p=c11tester.git
diff --git a/nodestack.h b/nodestack.h
index 147b0048..44d739c9 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,45 +56,57 @@ 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);
+ bool has_been_explored(thread_id_t tid) const;
/* return true = backtrack set is empty */
- bool backtrack_empty();
+ bool backtrack_empty() const;
void explore_child(ModelAction *act, enabled_type_t * is_enabled);
/* return false = thread was already in backtrack */
bool set_backtrack(thread_id_t id);
thread_id_t get_next_backtrack();
- bool is_enabled(Thread *t);
- bool is_enabled(thread_id_t tid);
- ModelAction * get_action() { return action; }
- bool has_priority(thread_id_t tid);
- int get_num_threads() {return num_threads;}
+ bool is_enabled(Thread *t) const;
+ bool is_enabled(thread_id_t tid) const;
+ enabled_type_t enabled_status(thread_id_t tid) const;
+
+ ModelAction * get_action() const { return action; }
+ bool has_priority(thread_id_t tid) 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. */
Node * get_parent() const { return parent; }
bool add_future_value(uint64_t value, modelclock_t expiration);
- uint64_t get_future_value();
- modelclock_t get_future_value_expiration();
+ uint64_t get_future_value() const;
+ modelclock_t get_future_value_expiration() const;
bool increment_future_value();
- bool future_value_empty();
+ bool future_value_empty() const;
void add_read_from(const ModelAction *act);
- const ModelAction * get_read_from();
+ const ModelAction * get_read_from() const;
bool increment_read_from();
- bool read_from_empty();
- int get_read_from_size();
+ bool read_from_empty() const;
+ int get_read_from_size() const;
const ModelAction * get_read_from_at(int i);
- void set_promise(unsigned int i);
- bool get_promise(unsigned int i);
+ void set_promise(unsigned int i, bool is_rmw);
+ bool get_promise(unsigned int i) const;
bool increment_promise();
- bool promise_empty();
+ bool promise_empty() const;
enabled_type_t *get_enabled_array() {return enabled_array;}
+ void set_misc_max(int i);
+ int get_misc() const;
+ bool increment_misc();
+ bool misc_empty() const;
+
+ void add_relseq_break(const ModelAction *write);
+ const ModelAction * get_relseq_break() const;
+ bool increment_relseq_break();
+ bool relseq_break_empty() const;
+
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;
@@ -134,18 +155,25 @@ public:
NodeStack();
~NodeStack();
ModelAction * explore_action(ModelAction *act, enabled_type_t * is_enabled);
- Node * get_head();
- Node * get_next();
+ Node * get_head() const;
+ Node * get_next() const;
void reset_execution();
void pop_restofstack(int numAhead);
int get_total_nodes() { return total_nodes; }
- void print();
+ void print() const;
MEMALLOC
private:
node_list_t node_list;
- unsigned int iter;
+
+ /**
+ * @brief the index position of the current head Node
+ *
+ * This index is relative to node_list. The index should point to the
+ * current head Node.
+ */
+ int head_idx;
int total_nodes;
};