model: rework assert_bug() and assert_user_bug() interfaces

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index e64597f8d4d9a745a9a9f09f6eda9fe198a4b945..85deb05e911dc33ae7ea1b245625802dbf4c8708 100644 (file)
--- a/model.h
+++ b/model.h
@@ -49,6 +49,14 @@ struct model_params {
        unsigned int expireslop;
 };
 
+/** @brief Model checker execution stats */
+struct execution_stats {
+       int num_total; /**< @brief Total number of executions */
+       int num_infeasible; /**< @brief Number of infeasible executions */
+       int num_buggy_executions; /** @brief Number of buggy executions */
+       int num_complete; /**< @brief Number of feasible, non-buggy, complete executions */
+};
+
 struct PendingFutureValue {
        ModelAction *writer;
        ModelAction *act;
@@ -108,9 +116,8 @@ public:
        void finish_execution();
        bool isfeasibleprefix() const;
 
-       void assert_bug(const char *msg, bool user_thread = false, bool immediate = false);
-       void assert_bug(bool user_thread = true);
-       void assert_bug_immediate(const char *msg);
+       bool assert_bug(const char *msg);
+       void assert_user_bug(const char *msg);
 
        void set_assert() {asserted=true;}
        bool is_deadlocked() const;
@@ -133,8 +140,6 @@ private:
        bool mo_may_allow(const ModelAction * writer, const ModelAction *reader);
        bool has_asserted() {return asserted;}
        void reset_asserted() {asserted=false;}
-       int num_executions;
-       int num_feasible_executions;
        bool promises_expired() const;
        void execute_sleep_set();
        void wake_up_sleeping_actions(ModelAction * curr);
@@ -238,6 +243,11 @@ private:
        /** @brief Incorrectly-ordered synchronization was made */
        bool bad_synchronization;
 
+       /** @brief The cumulative execution stats */
+       struct execution_stats stats;
+       void record_stats();
+       void print_stats() const;
+
        bool have_bug_reports() const;
        void print_bugs() const;
 };