add a new class 'ModelHistory'

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 77db6aa79569c9611d1e296fa5fa2b4134f6e584..4d8558e270613e968cccb01ea282f4af04d36a70 100644 (file)
--- a/model.h
+++ b/model.h
@@ -15,51 +15,44 @@
 #include "stl-model.h"
 #include "context.h"
 #include "params.h"
-
-/* Forward declaration */
-class Node;
-class NodeStack;
-class CycleGraph;
-class Promise;
-class Scheduler;
-class Thread;
-class ClockVector;
-class TraceAnalysis;
-class ModelExecution;
-class ModelAction;
+#include "classlist.h"
 
 typedef SnapList<ModelAction *> action_list_t;
 
 /** @brief Model checker execution stats */
 struct execution_stats {
-       int num_total; /**< @brief Total number of executions */
-       int num_infeasible; /**< @brief Number of infeasible executions */
-       int num_buggy_executions; /** @brief Number of buggy executions */
-       int num_complete; /**< @brief Number of feasible, non-buggy, complete executions */
-       int num_redundant; /**< @brief Number of redundant, aborted executions */
+       int num_total;  /**< @brief Total number of executions */
+       int num_infeasible;     /**< @brief Number of infeasible executions */
+       int num_buggy_executions;       /** @brief Number of buggy executions */
+       int num_complete;       /**< @brief Number of feasible, non-buggy, complete executions */
+       int num_redundant;      /**< @brief Number of redundant, aborted executions */
 };
 
 /** @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. */
+       void restart();
+
+       /** Exit the model checker, intended for pluggins. */
+       void exit_model_checker();
+
        /** @returns the context for the main model-checking system thread */
        ucontext_t * get_system_context() { return &system_context; }
 
-       const ModelExecution * get_execution() const { return execution; }
+       ModelExecution * get_execution() const { return execution; }
+       ModelHistory * get_history() const { return history; }
 
        int get_execution_number() const { return execution_number; }
 
        Thread * get_thread(thread_id_t tid) const;
        Thread * get_thread(const ModelAction *act) const;
 
-       bool is_enabled(Thread *t) const;
-       bool is_enabled(thread_id_t tid) const;
-
        Thread * get_current_thread() const;
 
        void switch_from_master(Thread *thread);
@@ -68,38 +61,39 @@ public:
        bool assert_bug(const char *msg, ...);
        void assert_user_bug(const char *msg);
 
-       const model_params params;
-       void add_trace_analysis(TraceAnalysis *a) {
-               trace_analyses.push_back(a);
-       }
+       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;
+
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler * const scheduler;
        NodeStack * const node_stack;
        ModelExecution *execution;
+       ModelHistory *history;
 
        int execution_number;
 
        unsigned int get_num_threads() const;
 
-       void execute_sleep_set();
-
        bool next_execution();
        bool should_terminate_execution();
 
        Thread * get_next_thread();
        void reset_to_initial_state();
 
-
-       ModelAction *diverge;
-       ModelAction *earliest_diverge;
-
        ucontext_t system_context;
 
        ModelVector<TraceAnalysis *> trace_analyses;
 
+       /** @bref Implement restart. */
+       void do_restart();
+       /** @bref Plugin that can inspect new actions. */
+       TraceAnalysis *inspect_plugin;
        /** @brief The cumulative execution stats */
        struct execution_stats stats;
        void record_stats();
@@ -113,4 +107,4 @@ private:
 
 extern ModelChecker *model;
 
-#endif /* __MODEL_H__ */
+#endif /* __MODEL_H__ */