small changes

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index c5a5aa78647deb2bfdb3ae7cf269b972ae5f89f0..fd65c0503b0ecd32ff16536a601a12c5fb9fab68 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 */
@@ -33,17 +31,10 @@ public:
        ModelChecker();
        ~ModelChecker();
        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();
 
-       /** @returns the context for the main model-checking system thread */
-       ucontext_t * get_system_context() { return &system_context; }
-
        ModelExecution * get_execution() const { return execution; }
        ModelHistory * get_history() const { return history; }
 
@@ -53,9 +44,9 @@ public:
        Thread * get_thread(const ModelAction *act) const;
 
        Thread * get_current_thread() const;
+       thread_id_t get_current_thread_id() const;
 
-       void switch_from_master(Thread *thread);
-       uint64_t switch_to_master(ModelAction *act);
+       uint64_t switch_thread(ModelAction *act);
 
        void assert_bug(const char *msg, ...);
 
@@ -69,9 +60,6 @@ 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;
 
@@ -83,20 +71,28 @@ private:
 
        int execution_number;
 
+       unsigned int curr_thread_num;
+       Thread * chosen_thread;
+       bool break_execution;
+
+       void startRunExecution(Thread *old);
+       void finishRunExecution(Thread *old);
+       Thread * getNextThread(Thread *old);
+       bool handleChosenThread(Thread *old);
+
+       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();
        void reset_to_initial_state();
 
-       ucontext_t system_context;
-
        ModelVector<TraceAnalysis *> trace_analyses;
+       char random_state[256];
 
-       /** @bref Implement restart. */
-       void do_restart();
        /** @bref Plugin that can inspect new actions. */
        TraceAnalysis *inspect_plugin;
        /** @brief The cumulative execution stats */