#include <list>
#include <vector>
#include <cstddef>
-#include "threads.h"
+#include <inttypes.h>
+
#include "mymemory.h"
-#include "clockvector.h"
+#include "modeltypes.h"
+#include "schedule.h"
class ModelAction;
+class Thread;
/**
* A flag used for the promise counting/combination problem within a node,
modelclock_t expiration;
};
+struct fairness_info {
+ unsigned int enabled_count;
+ unsigned int turns;
+ bool priority;
+};
+
/**
* @brief A single node in a NodeStack
*/
class Node {
public:
- Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, bool *enabled_array = NULL);
+ Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, Node *prevfairness = NULL);
~Node();
/* return true = thread choice has already been explored */
bool has_been_explored(thread_id_t tid);
/* return true = backtrack set is empty */
bool backtrack_empty();
- void explore_child(ModelAction *act);
+ 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;}
/** @return the parent Node to this Node; that is, the action that
* occurred previously in the stack. */
Node * get_parent() const { return parent; }
bool get_promise(unsigned int i);
bool increment_promise();
bool promise_empty();
+ enabled_type_t *get_enabled_array() {return enabled_array;}
+
+ 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();
ModelAction *action;
Node *parent;
int num_threads;
- std::vector< bool, MyAlloc<bool> > explored_children;
- std::vector< bool, MyAlloc<bool> > backtrack;
+ std::vector< bool, ModelAlloc<bool> > explored_children;
+ std::vector< bool, ModelAlloc<bool> > backtrack;
+ std::vector< struct fairness_info, ModelAlloc< struct fairness_info> > fairness;
int numBacktracks;
- bool *enabled_array;
+ enabled_type_t *enabled_array;
/** The set of ModelActions that this the action at this Node may read
* from. Only meaningful if this Node represents a 'read' action. */
- std::vector< const ModelAction *, MyAlloc< const ModelAction * > > may_read_from;
+ std::vector< const ModelAction *, ModelAlloc< const ModelAction * > > may_read_from;
unsigned int read_from_index;
- std::vector< struct future_value, MyAlloc<struct future_value> > future_values;
- std::vector< promise_t, MyAlloc<promise_t> > promises;
- unsigned int future_index;
+ std::vector< struct future_value, ModelAlloc<struct future_value> > future_values;
+ std::vector< promise_t, ModelAlloc<promise_t> > promises;
+ int future_index;
+
+ std::vector< const ModelAction *, ModelAlloc<const ModelAction *> > relseq_break_writes;
+ int relseq_break_index;
};
-typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
+typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
/**
* @brief A stack of nodes
public:
NodeStack();
~NodeStack();
- ModelAction * explore_action(ModelAction *act, bool * is_enabled);
+ ModelAction * explore_action(ModelAction *act, enabled_type_t * is_enabled);
Node * get_head();
Node * get_next();
void reset_execution();
MEMALLOC
private:
node_list_t node_list;
- node_list_t::iterator iter;
+ unsigned int iter;
int total_nodes;
};