remove another field

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 92592e5a8a191c2cc9421e944c32a2cc47c0eda1..9f7804d838bd079323ace1923df7254241c90590 100644 (file)
--- a/model.h
+++ b/model.h
@@ -20,7 +20,6 @@
 class Node;
 class NodeStack;
 class CycleGraph;
-class Promise;
 class Scheduler;
 class Thread;
 class ClockVector;
@@ -47,20 +46,25 @@ public:
 
        void run();
 
+       /** Restart the model checker, intended for pluggins. */
+       void restart();
+
+       /** 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; }
 
-       const ModelExecution * get_execution() const { return execution; }
+       ModelExecution * get_execution() const { return execution; }
 
        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;
-
-       unsigned int get_num_threads() const;
        Thread * get_current_thread() const;
 
        void switch_from_master(Thread *thread);
@@ -70,12 +74,15 @@ public:
        void assert_user_bug(const char *msg);
 
        const model_params params;
-       void add_trace_analysis(TraceAnalysis *a) {
-               trace_analyses.push_back(a);
-       }
-
+       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;
        NodeStack * const node_stack;
@@ -83,7 +90,7 @@ private:
 
        int execution_number;
 
-       void execute_sleep_set();
+       unsigned int get_num_threads() const;
 
        bool next_execution();
        bool should_terminate_execution();
@@ -91,7 +98,6 @@ private:
        Thread * get_next_thread();
        void reset_to_initial_state();
 
-
        ModelAction *diverge;
        ModelAction *earliest_diverge;
 
@@ -99,6 +105,10 @@ private:
 
        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();