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

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index a1a04d138cb31d4fe5936d648303073871a7d400..ffc1a0c64b3175785440806f1be8c758b8ee62c1 100644 (file)
--- a/model.h
+++ b/model.h
@@ -18,8 +18,6 @@
 #include "classlist.h"
 #include "snapshot-interface.h"
 
-typedef SnapList<ModelAction *> action_list_t;
-
 /** @brief Model checker execution stats */
 struct execution_stats {
        int num_total;  /**< @brief Total number of executions */
@@ -55,6 +53,14 @@ public:
        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, ...);
 
        void assert_user_bug(const char *msg);
@@ -78,7 +84,14 @@ private:
 
        int execution_number;
 
-       int curr_thread_num;
+       unsigned int curr_thread_num;
+
+       Thread * chosen_thread;
+
+       bool thread_chosen;
+       bool break_execution;
+
+       modelclock_t checkfree;
 
        unsigned int get_num_threads() const;