#include <cstddef>
#include "threads.h"
#include "mymemory.h"
+#include "clockvector.h"
class ModelAction;
PROMISE_FULFILLED /**< This promise is applicable and fulfilled */
} promise_t;
+struct future_value {
+ uint64_t value;
+ modelclock_t expiration;
+};
+
+
/**
* @brief A single node in a NodeStack
*
*/
class Node {
public:
- Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1);
+ Node(ModelAction *act = NULL, Node *par = NULL, int nthreads = 1, bool *enabled_array = NULL);
~Node();
/* return true = thread choice has already been explored */
bool has_been_explored(thread_id_t tid);
* occurred previously in the stack. */
Node * get_parent() const { return parent; }
- bool add_future_value(uint64_t value);
+ bool add_future_value(uint64_t value, modelclock_t expiration);
uint64_t get_future_value();
+ modelclock_t get_future_value_expiration();
bool increment_future_value();
bool future_value_empty();
std::vector< bool, MyAlloc<bool> > explored_children;
std::vector< bool, MyAlloc<bool> > backtrack;
int numBacktracks;
+ bool *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. */
unsigned int read_from_index;
- std::vector< uint64_t, MyAlloc< uint64_t > > future_values;
+ std::vector< struct future_value, MyAlloc<struct future_value> > future_values;
std::vector< promise_t, MyAlloc<promise_t> > promises;
unsigned int future_index;
};
public:
NodeStack();
~NodeStack();
- ModelAction * explore_action(ModelAction *act);
+ ModelAction * explore_action(ModelAction *act, bool * enabled);
Node * get_head();
Node * get_next();
void reset_execution();