projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
main: rename 'real_main()' to 'model_main()'
[model-checker.git]
/
nodestack.h
diff --git
a/nodestack.h
b/nodestack.h
index 421890f4f998c57d3ce4364263c0adaa631ad36c..803d2b8e492c05a98f23a628550dd4f05265e23f 100644
(file)
--- a/
nodestack.h
+++ b/
nodestack.h
@@
-8,11
+8,14
@@
#include <list>
#include <vector>
#include <cstddef>
#include <list>
#include <vector>
#include <cstddef>
-#include "threads.h"
+#include <inttypes.h>
+
#include "mymemory.h"
#include "mymemory.h"
-#include "clockvector.h"
+#include "modeltypes.h"
+#include "schedule.h"
class ModelAction;
class ModelAction;
+class Thread;
/**
* A flag used for the promise counting/combination problem within a node,
/**
* A flag used for the promise counting/combination problem within a node,
@@
-57,7
+60,7
@@
public:
/* return true = backtrack set is empty */
bool backtrack_empty();
/* return true = backtrack set is empty */
bool backtrack_empty();
- void explore_child(ModelAction *act,
bool
* is_enabled);
+ 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();
/* return false = thread was already in backtrack */
bool set_backtrack(thread_id_t id);
thread_id_t get_next_backtrack();
@@
-87,6
+90,12
@@
public:
bool get_promise(unsigned int i);
bool increment_promise();
bool promise_empty();
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();
void print();
void print_may_read_from();
@@
-102,7
+111,7
@@
private:
std::vector< bool, ModelAlloc<bool> > backtrack;
std::vector< struct fairness_info, ModelAlloc< struct fairness_info> > fairness;
int numBacktracks;
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. */
/** The set of ModelActions that this the action at this Node may read
* from. Only meaningful if this Node represents a 'read' action. */
@@
-113,6
+122,9
@@
private:
std::vector< struct future_value, ModelAlloc<struct future_value> > future_values;
std::vector< promise_t, ModelAlloc<promise_t> > promises;
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::vector< Node *, ModelAlloc< Node * > > node_list_t;
};
typedef std::vector< Node *, ModelAlloc< Node * > > node_list_t;
@@
-129,7
+141,7
@@
class NodeStack {
public:
NodeStack();
~NodeStack();
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();
Node * get_head();
Node * get_next();
void reset_execution();