model: privatize some functions

Just kill finish_execution() while we're at it.

diff --git a/model.cc b/model.cc
index 43700989ad530a057fdcd70f45f30ad2b01f147e..72610f6581e500231941a1613274891556687f3f 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -2510,13 +2510,6 @@ bool ModelChecker::take_step() {
        return (Thread::swap(&system_context, next) == 0);
 }
 
-/** Runs the current execution until threre are no more steps to take. */
-void ModelChecker::finish_execution() {
-       DBG();
-
-       while (take_step());
-}
-
 /** Wrapper to run the user's main function, with appropriate arguments */
 void user_main_wrapper(void *)
 {
@@ -2533,7 +2526,7 @@ void ModelChecker::run()
                add_thread(new Thread(&user_thread, &user_main_wrapper, NULL));
 
                /* Wait for all threads to complete */
-               finish_execution();
+               while (take_step());
        } while (next_execution());
 
        print_stats();

diff --git a/model.h b/model.h
index 5f389c5b9d245d359434772240e7212a27c7c8ba..e4cefd1eccae8d4aa4313baa2c987583e92dac57 100644 (file)
--- a/model.h
+++ b/model.h
@@ -116,24 +116,16 @@ public:
        int switch_to_master(ModelAction *act);
        ClockVector * get_cv(thread_id_t tid);
        ModelAction * get_parent_action(thread_id_t tid);
-       bool next_execution();
-       bool isfeasible() const;
-       bool isfeasibleotherthanRMW() const;
        bool isfinalfeasible() const;
        void check_promises_thread_disabled();
        void mo_check_promises(thread_id_t tid, const ModelAction *write);
        void check_promises(thread_id_t tid, ClockVector *old_cv, ClockVector * merge_cv);
        void get_release_seq_heads(ModelAction *act, rel_heads_list_t *release_heads);
-       void finish_execution();
        bool isfeasibleprefix() const;
 
        bool assert_bug(const char *msg);
        void assert_user_bug(const char *msg);
 
-       bool is_deadlocked() const;
-       bool is_complete_execution() const;
-       void print_stats() const;
-
        void set_bad_synchronization();
 
        const model_params params;
@@ -154,6 +146,7 @@ private:
        void wake_up_sleeping_actions(ModelAction * curr);
        modelclock_t get_next_seq_num();
 
+       bool next_execution();
        void set_current_action(ModelAction *act);
        Thread * check_current_action(ModelAction *curr);
        bool initialize_curr_action(ModelAction **curr);
@@ -251,9 +244,14 @@ private:
        struct execution_stats stats;
        void record_stats();
 
+       bool isfeasibleotherthanRMW() const;
+       bool isfeasible() const;
+       bool is_deadlocked() const;
+       bool is_complete_execution() const;
        bool have_bug_reports() const;
        void print_bugs() const;
        void print_execution(bool printbugs) const;
+       void print_stats() const;
 
        friend void user_main_wrapper();
 };