projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nodestack: add 'may_read_from' set
[model-checker.git]
/
nodestack.h
diff --git
a/nodestack.h
b/nodestack.h
index a73ce44034fba9bc44d76ebe27f8912c21132c83..74ac245f3b3b00331a3328482d7c21c47bdc7cdb 100644
(file)
--- a/
nodestack.h
+++ b/
nodestack.h
@@
-7,12
+7,15
@@
#include <list>
#include <vector>
#include <list>
#include <vector>
+#include <set>
#include <cstddef>
#include "threads.h"
#include "mymemory.h"
class ModelAction;
#include <cstddef>
#include "threads.h"
#include "mymemory.h"
class ModelAction;
+typedef std::set< ModelAction *, std::less< ModelAction *>, MyAlloc< ModelAction * > > action_set_t;
+
class Node {
public:
Node(ModelAction *act = NULL, int nthreads = 1);
class Node {
public:
Node(ModelAction *act = NULL, int nthreads = 1);
@@
-28,6
+31,8
@@
public:
bool is_enabled(Thread *t);
ModelAction * get_action() { return action; }
bool is_enabled(Thread *t);
ModelAction * get_action() { return action; }
+ void add_read_from(ModelAction *act);
+
void print();
MEMALLOC
void print();
MEMALLOC
@@
-39,6
+44,10
@@
private:
std::vector< bool, MyAlloc<bool> > explored_children;
std::vector< bool, MyAlloc<bool> > backtrack;
int numBacktracks;
std::vector< bool, MyAlloc<bool> > explored_children;
std::vector< bool, MyAlloc<bool> > backtrack;
int numBacktracks;
+
+ /** 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;
};
typedef std::list<class Node *, MyAlloc< class Node * > > node_list_t;
};
typedef std::list<class Node *, MyAlloc< class Node * > > node_list_t;