model: make scheduler private

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index e93c4b51f6aa0cf9c12529c6f1220823f63cb380..86e0b1e7b05a8174a05d8a3f28dc7132432962d5 100644 (file)
--- a/model.h
+++ b/model.h
@@ -36,9 +36,6 @@ public:
        ModelChecker(struct model_params params);
        ~ModelChecker();
 
-       /** The scheduler to use: tracks the running/ready Threads */
-       Scheduler *scheduler;
-
        /** Stores the context for the main model-checking system thread (call
         * once)
         * @param ctxt The system context structure
@@ -50,12 +47,8 @@ public:
 
        void check_current_action(void);
 
-       /**
-        * Prints an execution summary with trace information.
-        * @param feasible Formats outputting according to whether or not the
-        * current trace is feasible. Defaults to feasible = true.
-        */
-       void print_summary(bool feasible = true);
+       /** Prints an execution summary with trace information. */
+       void print_summary();
 
        Thread * schedule_next_thread();
 
@@ -67,6 +60,9 @@ public:
        int get_num_threads();
        modelclock_t get_next_seq_num();
 
+       /** @return The currently executing Thread. */
+       Thread * get_current_thread() { return scheduler->get_current_thread(); }
+
        int switch_to_master(ModelAction *act);
        ClockVector * get_cv(thread_id_t tid);
        bool next_execution();
@@ -74,8 +70,13 @@ public:
        bool isfinalfeasible();
        void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
+       void finish_execution();
+
        MEMALLOC
 private:
+       /** The scheduler to use: tracks the running/ready Threads */
+       Scheduler *scheduler;
+
        int next_thread_id;
        modelclock_t used_sequence_numbers;
        int num_executions;
@@ -90,6 +91,8 @@ private:
         */
        void set_current_action(ModelAction *act) { current_action = act; }
 
+       bool take_step();
+
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
        thread_id_t get_next_replay_thread();