projects
/
model-checker.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execution: move execution number back to ModelChecker class
[model-checker.git]
/
execution.h
diff --git
a/execution.h
b/execution.h
index 0f1e8aed1e243dc3a05d4b7fa666e33fca400c71..616a47cb47a4e34c182359e0217724b2808e59ad 100644
(file)
--- a/
execution.h
+++ b/
execution.h
@@
-60,7
+60,10
@@
struct release_seq {
/** @brief The central structure for model-checking */
class ModelExecution {
public:
/** @brief The central structure for model-checking */
class ModelExecution {
public:
- ModelExecution(struct model_params *params, Scheduler *scheduler, NodeStack *node_stack);
+ ModelExecution(ModelChecker *m,
+ struct model_params *params,
+ Scheduler *scheduler,
+ NodeStack *node_stack);
~ModelExecution();
Thread * take_step(ModelAction *curr);
~ModelExecution();
Thread * take_step(ModelAction *curr);
@@
-110,10
+113,12
@@
public:
action_list_t * get_action_trace() const { return action_trace; }
action_list_t * get_action_trace() const { return action_trace; }
- void increment_execution_number() { execution_number++; }
-
MEMALLOC
private:
MEMALLOC
private:
+ int get_execution_number() const;
+
+ ModelChecker *model;
+
const model_params * const params;
/** The scheduler to use: tracks the running/ready Threads */
const model_params * const params;
/** The scheduler to use: tracks the running/ready Threads */
@@
-231,8
+236,6
@@
private:
*/
CycleGraph * const mo_graph;
*/
CycleGraph * const mo_graph;
- int execution_number;
-
Thread * action_select_next_thread(const ModelAction *curr) const;
};
Thread * action_select_next_thread(const ModelAction *curr) const;
};