rename params

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index ea526f7499bff4e919385fa9fda5d31f2d207eec..503b225d23569b4acc8a9b8564ab80c9537c621c 100644 (file)
--- a/model.h
+++ b/model.h
@@ -16,6 +16,7 @@
 #include "context.h"
 #include "params.h"
 #include "classlist.h"
+#include "snapshot-interface.h"
 
 typedef SnapList<ModelAction *> action_list_t;
 
@@ -34,9 +35,6 @@ public:
        model_params * getParams();
        void run();
 
-       /** Restart the model checker, intended for pluggins. */
-       void restart();
-
        /** Exit the model checker, intended for pluggins. */
        void exit_model_checker();
 
@@ -55,6 +53,15 @@ public:
 
        void switch_from_master(Thread *thread);
        uint64_t switch_to_master(ModelAction *act);
+       uint64_t switch_thread(ModelAction *act);
+
+       void continueExecution(Thread *old);
+       void finishExecution(Thread *old);
+       void consumeAction();
+       void chooseThread(ModelAction *act, Thread *thr);
+       Thread * getNextThread();
+       void handleChosenThread(Thread *old);
+       void handleNewValidThread(Thread *old, Thread *next);
 
        void assert_bug(const char *msg, ...);
 
@@ -68,8 +75,8 @@ public:
        Scheduler * getScheduler() {return scheduler;}
        MEMALLOC
 private:
-       /** Flag indicates whether to restart the model checker. */
-       bool restart_flag;
+       /** Snapshot id we return to restart. */
+       snapshot_id snapshot;
 
        /** The scheduler to use: tracks the running/ready Threads */
        Scheduler * const scheduler;
@@ -79,9 +86,17 @@ private:
 
        int execution_number;
 
+       unsigned int curr_thread_num;
+
+       Thread * chosen_thread;
+
+       bool thread_chosen;
+
+       modelclock_t checkfree;
+
        unsigned int get_num_threads() const;
 
-       bool next_execution();
+       void finish_execution(bool moreexecutions);
        bool should_terminate_execution();
 
        Thread * get_next_thread();
@@ -91,8 +106,6 @@ 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 */