model: add const

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index f92c8bdf75679b1cd8b9c0915f210e1d6f667b23..80917741c0048ad1d05ca952d2459484f1523fce 100644 (file)
--- a/model.h
+++ b/model.h
@@ -50,6 +50,12 @@ struct model_params {
 
        /** @brief Verbosity (0 = quiet; 1 = noisy) */
        int verbose;
+
+       /** @brief Command-line argument count to pass to user program */
+       int argc;
+
+       /** @brief Command-line arguments to pass to user program */
+       char **argv;
 };
 
 /** @brief Model checker execution stats */
@@ -85,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; }
 
@@ -103,35 +111,24 @@ public:
 
        thread_id_t get_next_id();
        unsigned int get_num_threads() const;
-       Thread * get_current_thread();
+       Thread * get_current_thread() const;
 
        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;
+       ClockVector * get_cv(thread_id_t tid) const;
+       ModelAction * get_parent_action(thread_id_t tid) 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;
-
-       /** @brief Alert the model-checker that an incorrectly-ordered
-        * synchronization was made */
-       void set_bad_synchronization() { bad_synchronization = true; }
+       void set_bad_synchronization();
 
        const model_params params;
-       Node * get_curr_node();
+       Node * get_curr_node() const;
 
        MEMALLOC
 private:
@@ -141,14 +138,14 @@ private:
        bool sleep_can_read_from(ModelAction * curr, const ModelAction *write);
        bool thin_air_constraint_may_allow(const ModelAction * writer, const ModelAction *reader);
        bool mo_may_allow(const ModelAction * writer, const ModelAction *reader);
-       bool has_asserted() {return asserted;}
-       void reset_asserted() { asserted = false; }
-       void set_assert() { asserted = true; }
+       bool has_asserted() const;
+       void set_assert();
        bool promises_expired() const;
        void execute_sleep_set();
        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);
@@ -241,19 +238,22 @@ private:
         * <tt>b</tt>.
         */
        CycleGraph *mo_graph;
-       bool failed_promise;
-       bool too_many_reads;
-       bool asserted;
-       /** @brief Incorrectly-ordered synchronization was made */
-       bool bad_synchronization;
 
        /** @brief The cumulative execution stats */
        struct execution_stats stats;
        void record_stats();
 
+       bool is_feasible_prefix_ignore_relseq() 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;