More fuzzing changes

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 9f7804d838bd079323ace1923df7254241c90590..166eb12d21de204e9b69e5bfd0872d8f55cbab23 100644 (file)
--- a/model.h
+++ b/model.h
@@ -15,17 +15,7 @@
 #include "stl-model.h"
 #include "context.h"
 #include "params.h"
-
-/* Forward declaration */
-class Node;
-class NodeStack;
-class CycleGraph;
-class Scheduler;
-class Thread;
-class ClockVector;
-class TraceAnalysis;
-class ModelExecution;
-class ModelAction;
+#include "classlist.h"
 
 typedef SnapList<ModelAction *> action_list_t;
 
@@ -41,9 +31,9 @@ struct execution_stats {
 /** @brief The central structure for model-checking */
 class ModelChecker {
 public:
-       ModelChecker(struct model_params params);
+       ModelChecker();
        ~ModelChecker();
-
+       void setParams(struct model_params params);
        void run();
 
        /** Restart the model checker, intended for pluggins. */
@@ -52,9 +42,6 @@ public:
        /** Exit the model checker, intended for pluggins. */
        void exit_model_checker();
 
-       /** Check the exit_flag. */
-       bool get_exit_flag() const { return exit_flag; }
-
        /** @returns the context for the main model-checking system thread */
        ucontext_t * get_system_context() { return &system_context; }
 
@@ -73,15 +60,13 @@ public:
        bool assert_bug(const char *msg, ...);
        void assert_user_bug(const char *msg);
 
-       const model_params params;
+  model_params params;
        void add_trace_analysis(TraceAnalysis *a) {     trace_analyses.push_back(a); }
        void set_inspect_plugin(TraceAnalysis *a) {     inspect_plugin=a;       }
        MEMALLOC
 private:
        /** Flag indicates whether to restart the model checker. */
        bool restart_flag;
-       /** Flag indicates whether to exit the model checker. */
-       bool exit_flag;
 
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler * const scheduler;
@@ -98,9 +83,6 @@ private:
        Thread * get_next_thread();
        void reset_to_initial_state();
 
-       ModelAction *diverge;
-       ModelAction *earliest_diverge;
-
        ucontext_t system_context;
 
        ModelVector<TraceAnalysis *> trace_analyses;