model: rename get_last_seq_cst -> get_last_seq_cst_write

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 5473e52c2c78b3613ca5f0013c29f5a41f895dd4..d0e47d9d6212ad004194aac45ef070a96ed5d2c0 100644 (file)
--- a/model.h
+++ b/model.h
@@ -5,7 +5,6 @@
 #ifndef __MODEL_H__
 #define __MODEL_H__
 
-#include <list>
 #include <vector>
 #include <cstddef>
 #include <ucontext.h>
@@ -50,6 +49,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 +90,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,33 +110,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;
-
        void set_bad_synchronization();
 
        const model_params params;
-       Node * get_curr_node();
+       Node * get_curr_node() const;
 
        MEMALLOC
 private:
@@ -146,6 +144,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);
@@ -171,7 +170,7 @@ private:
        void check_curr_backtracking(ModelAction * curr);
        void add_action_to_lists(ModelAction *act);
        ModelAction * get_last_action(thread_id_t tid) const;
-       ModelAction * get_last_seq_cst(ModelAction *curr) const;
+       ModelAction * get_last_seq_cst_write(ModelAction *curr) const;
        ModelAction * get_last_unlock(ModelAction *curr) const;
        void build_reads_from_past(ModelAction *curr);
        ModelAction * process_rmw(ModelAction *curr);
@@ -243,9 +242,17 @@ private:
        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;