execution: move execution number back to ModelChecker class

[model-checker.git] / execution.h

diff --git a/execution.h b/execution.h
index 6810fee665a6b018cbec1c353b12f22667a8c42e..616a47cb47a4e34c182359e0217724b2808e59ad 100644 (file)
--- a/execution.h
+++ b/execution.h
@@ -14,7 +14,6 @@
 #include "config.h"
 #include "modeltypes.h"
 #include "stl-model.h"
-#include "context.h"
 #include "params.h"
 
 /* Forward declaration */
@@ -61,7 +60,10 @@ struct release_seq {
 /** @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);
@@ -111,10 +113,12 @@ public:
 
        action_list_t * get_action_trace() const { return action_trace; }
 
-       void increment_execution_number() { execution_number++; }
-
        MEMALLOC
 private:
+       int get_execution_number() const;
+
+       ModelChecker *model;
+
        const model_params * const params;
 
        /** The scheduler to use: tracks the running/ready Threads */
@@ -232,8 +236,6 @@ private:
         */
        CycleGraph * const mo_graph;
 
-       int execution_number;
-
        Thread * action_select_next_thread(const ModelAction *curr) const;
 };