new test case

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index 4f139878ce00300f4252c1705537deabd7643a5f..c97cbf1a05f905fb79087c21b91401548b5ecf2e 100644 (file)
--- a/model.h
+++ b/model.h
@@ -101,7 +101,7 @@ public:
 
        void print_summary() const;
 #if SUPPORT_MOD_ORDER_DUMP
-       void dumpGraph(char *filename);
+       void dumpGraph(char *filename) const;
 #endif
 
        void add_thread(Thread *t);
@@ -116,7 +116,7 @@ public:
        unsigned int get_num_threads() const;
        Thread * get_current_thread() const;
 
-       int switch_to_master(ModelAction *act);
+       uint64_t switch_to_master(ModelAction *act);
        ClockVector * get_cv(thread_id_t tid) const;
        ModelAction * get_parent_action(thread_id_t tid) const;
        void check_promises_thread_disabled();
@@ -148,7 +148,7 @@ private:
 
        bool next_execution();
        void set_current_action(ModelAction *act);
-       Thread * check_current_action(ModelAction *curr);
+       ModelAction * check_current_action(ModelAction *curr);
        bool initialize_curr_action(ModelAction **curr);
        bool process_read(ModelAction *curr, bool second_part_of_rmw);
        bool process_write(ModelAction *curr);
@@ -159,12 +159,13 @@ private:
        bool read_from(ModelAction *act, const ModelAction *rf);
        bool check_action_enabled(ModelAction *curr);
 
-       bool take_step();
+       bool take_step(ModelAction *curr);
 
        void check_recency(ModelAction *curr, const ModelAction *rf);
        ModelAction * get_last_conflict(ModelAction *act);
        void set_backtracking(ModelAction *act);
        Thread * get_next_thread(ModelAction *curr);
+       bool set_latest_backtrack(ModelAction *act);
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
        bool resolve_promises(ModelAction *curr);