projects
/
c11tester.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
changes
[c11tester.git]
/
nodestack.h
diff --git
a/nodestack.h
b/nodestack.h
index ad63d4dfc999f3ee5beec28c258c9facf5c8d9b0..9ccde8da34e953052660292d6b865cb53dbe76e0 100644
(file)
--- a/
nodestack.h
+++ b/
nodestack.h
@@
-13,7
+13,8
@@
class ModelAction;
class ModelAction;
-typedef std::list< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
+typedef std::vector< const ModelAction *, MyAlloc< const ModelAction * > > readfrom_set_t;
+typedef std::vector< uint64_t, MyAlloc< uint64_t > > futurevalues_t;
/**
* @brief A single node in a NodeStack
/**
* @brief A single node in a NodeStack
@@
-32,6
+33,8
@@
public:
bool has_been_explored(thread_id_t tid);
/* return true = backtrack set is empty */
bool backtrack_empty();
bool has_been_explored(thread_id_t tid);
/* return true = backtrack set is empty */
bool backtrack_empty();
+ bool readsfrom_empty();
+ bool futurevalues_empty();
void explore_child(ModelAction *act);
/* return false = thread was already in backtrack */
bool set_backtrack(thread_id_t id);
void explore_child(ModelAction *act);
/* return false = thread was already in backtrack */
bool set_backtrack(thread_id_t id);
@@
-43,8
+46,12
@@
public:
* occurred previously in the stack. */
Node * get_parent() const { return parent; }
* occurred previously in the stack. */
Node * get_parent() const { return parent; }
+ bool add_future_value(uint64_t value);
void add_read_from(const ModelAction *act);
void add_read_from(const ModelAction *act);
- const ModelAction * get_next_read_from();
+ const ModelAction * get_read_from();
+ uint64_t get_future_value();
+ bool increment_read_from();
+ bool increment_future_values();
void print();
void print_may_read_from();
void print();
void print_may_read_from();
@@
-63,6
+70,10
@@
private:
/** The set of ModelActions that this the action at this Node may read
* from. Only meaningful if this Node represents a 'read' action. */
readfrom_set_t may_read_from;
/** The set of ModelActions that this the action at this Node may read
* from. Only meaningful if this Node represents a 'read' action. */
readfrom_set_t may_read_from;
+ unsigned int read_from_index;
+
+ futurevalues_t future_values;
+ unsigned int future_index;
};
typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
};
typedef std::list< Node *, MyAlloc< Node * > > node_list_t;
@@
-83,7
+94,7
@@
public:
Node * get_head();
Node * get_next();
void reset_execution();
Node * get_head();
Node * get_next();
void reset_execution();
- void pop_restofstack();
+ void pop_restofstack(
int numAhead
);
int get_total_nodes() { return total_nodes; }
void print();
int get_total_nodes() { return total_nodes; }
void print();