Merge branch 'master' of /home/git/random-fuzzer into thread-switch

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index d4b11d5b95d3fc677cc079fce801f6de2cfc526d..ffc1a0c64b3175785440806f1be8c758b8ee62c1 100644 (file)
--- a/model.h
+++ b/model.h
@@ -16,8 +16,7 @@
 #include "context.h"
 #include "params.h"
 #include "classlist.h"
-
-typedef SnapList<ModelAction *> action_list_t;
+#include "snapshot-interface.h"
 
 /** @brief Model checker execution stats */
 struct execution_stats {
@@ -34,9 +33,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 +51,15 @@ public:
 
        void switch_from_master(Thread *thread);
        uint64_t switch_to_master(ModelAction *act);
+       uint64_t switch_thread(ModelAction *act);
+
+       void startRunExecution(Thread *old);
+       void finishRunExecution(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, ...);
 
@@ -63,14 +68,13 @@ public:
        model_params params;
        void add_trace_analysis(TraceAnalysis *a) {     trace_analyses.push_back(a); }
        void set_inspect_plugin(TraceAnalysis *a) {     inspect_plugin=a;       }
-       void startMainThread();
        void startChecker();
        Thread * getInitThread() {return init_thread;}
        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;
@@ -80,9 +84,18 @@ private:
 
        int execution_number;
 
+       unsigned int curr_thread_num;
+
+       Thread * chosen_thread;
+
+       bool thread_chosen;
+       bool break_execution;
+
+       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();
@@ -92,8 +105,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 */
@@ -103,8 +114,6 @@ private:
        void print_bugs() const;
        void print_execution(bool printbugs) const;
        void print_stats() const;
-
-       friend void user_main_wrapper();
 };
 
 extern ModelChecker *model;