model: privatize, move isfinalfeasible()

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 04e191bed53340819ee1fa87c326bf9bcfbc89a6..3f1103e543fa987164cc8d75f7c0c92779a6ff86 100644 (file)
--- a/model.h
+++ b/model.h
@@ -91,6 +91,8 @@ public:
        ModelChecker(struct model_params params);
        ~ModelChecker();
 
+       void run();
+
        /** @returns the context for the main model-checking system thread */
        ucontext_t * get_system_context() { return &system_context; }
 
@@ -114,24 +116,15 @@ 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;
@@ -152,6 +145,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);
@@ -249,9 +243,17 @@ private:
        struct execution_stats stats;
        void record_stats();
 
+       bool isfinalfeasible() const;
+       bool is_infeasible_ignoreRMW() const;
+       bool is_infeasible() 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();
 };
 
 extern ModelChecker *model;