model: reformat some code

[model-checker.git] / model.h

diff --git a/model.h b/model.h
index e6dc06ddd97c2aef7d7c7dd17ae71854162ffb5e..4e4dcf0ff702b9e825646d0dc56407b81cbed38e 100644 (file)
--- a/model.h
+++ b/model.h
@@ -42,7 +42,14 @@ public:
        ucontext_t * get_system_context(void) { return system_context; }
 
        void check_current_action(void);
-       void print_summary(void);
+
+       /**
+        * Prints an execution summary with trace information.
+        * @param feasible Formats outputting according to whether or not the
+        * current trace is feasible. Defaults to feasible = true.
+        */
+       void print_summary(bool feasible = true);
+
        Thread * schedule_next_thread();
 
        int add_thread(Thread *t);
@@ -57,6 +64,7 @@ public:
        ClockVector * get_cv(thread_id_t tid);
        bool next_execution();
        bool isfeasible();
+       bool isfinalfeasible();
        void check_promises(ClockVector *old_cv, ClockVector * merge_cv);
 
        MEMALLOC
@@ -78,6 +86,8 @@ private:
        thread_id_t get_next_replay_thread();
        ModelAction * get_next_backtrack();
        void reset_to_initial_state();
+       void resolve_promises(ModelAction *curr);
+       void compute_promises(ModelAction *curr);
 
        void add_action_to_lists(ModelAction *act);
        ModelAction * get_last_action(thread_id_t tid);
@@ -85,9 +95,10 @@ private:
        ModelAction * get_last_seq_cst(const void *location);
        void build_reads_from_past(ModelAction *curr);
        ModelAction * process_rmw(ModelAction * curr);
+       void post_r_modification_order(ModelAction * curr, const ModelAction *rf);
        void r_modification_order(ModelAction * curr, const ModelAction *rf);
        void w_modification_order(ModelAction * curr);
-       
+
        ModelAction *current_action;
        ModelAction *diverge;
        thread_id_t nextThread;