#include <list>
#include <vector>
-#include <set>
#include <cstddef>
#include "threads.h"
#include "mymemory.h"
class ModelAction;
-typedef std::set< ModelAction *, std::less< ModelAction *>, MyAlloc< ModelAction * > > action_set_t;
+typedef std::vector< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
+typedef std::vector< uint64_t, MyAlloc< uint64_t > > futurevalues_t;
+typedef std::vector< uint32_t, MyAlloc< uint32_t > > promises_t;
/**
* @brief A single node in a NodeStack
bool has_been_explored(thread_id_t tid);
/* return true = backtrack set is empty */
bool backtrack_empty();
+
void explore_child(ModelAction *act);
/* return false = thread was already in backtrack */
bool set_backtrack(thread_id_t id);
* occurred previously in the stack. */
Node * get_parent() const { return parent; }
- void add_read_from(ModelAction *act);
+ bool add_future_value(uint64_t value);
+ uint64_t get_future_value();
+ bool increment_future_value();
+ bool future_value_empty();
+
+ void add_read_from(const ModelAction *act);
+ const ModelAction * get_read_from();
+ bool increment_read_from();
+ bool read_from_empty();
+
+ void set_promise(uint32_t i);
+ bool get_promise(uint32_t i);
+ bool increment_promise();
+ bool promise_empty();
void print();
+ void print_may_read_from();
MEMALLOC
private:
/** The set of ModelActions that this the action at this Node may read
* from. Only meaningful if this Node represents a 'read' action. */
- action_set_t *may_read_from;
+ readfrom_set_t may_read_from;
+ unsigned int read_from_index;
+
+ futurevalues_t future_values;
+ promises_t promises;
+ unsigned int future_index;
};
-typedef std::list<class Node *, MyAlloc< class Node * > > node_list_t;
+typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
/**
* @brief A stack of nodes
Node * get_head();
Node * get_next();
void reset_execution();
-
+ void pop_restofstack(int numAhead);
int get_total_nodes() { return total_nodes; }
void print();