model: rework assert_bug() and assert_user_bug() interfaces

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 6e7f2244c66999c85a76f00f91d024f3dc6593f5..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;
@@ -98,17 +106,22 @@ public:
        ClockVector * get_cv(thread_id_t tid);
        ModelAction * get_parent_action(thread_id_t tid);
        bool next_execution();
-       bool isfeasible();
-       bool isfeasibleotherthanRMW();
-       bool isfinalfeasible();
+       bool isfeasible() const;
+       bool isfeasibleotherthanRMW() const;
+       bool isfinalfeasible() 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();
+       bool isfeasibleprefix() const;
+
+       bool assert_bug(const char *msg);
+       void assert_user_bug(const char *msg);
+
        void set_assert() {asserted=true;}
        bool is_deadlocked() const;
+       bool is_complete_execution() const;
 
        /** @brief Alert the model-checker that an incorrectly-ordered
         * synchronization was made */
@@ -127,9 +140,7 @@ 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();
+       bool promises_expired() const;
        void execute_sleep_set();
        void wake_up_sleeping_actions(ModelAction * curr);
        modelclock_t get_next_seq_num();
@@ -178,17 +189,17 @@ private:
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
-       HashTable<const void *, action_list_t, uintptr_t, 4> *obj_map;
+       HashTable<const void *, action_list_t *, uintptr_t, 4> *obj_map;
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
-       HashTable<const void *, action_list_t, uintptr_t, 4> *lock_waiters_map;
+       HashTable<const void *, action_list_t *, uintptr_t, 4> *lock_waiters_map;
 
        /** Per-object list of actions. Maps an object (i.e., memory location)
         * to a trace of all actions performed on the object. */
-       HashTable<const void *, action_list_t, uintptr_t, 4> *condvar_waiters_map;
+       HashTable<const void *, action_list_t *, uintptr_t, 4> *condvar_waiters_map;
 
-       HashTable<void *, std::vector<action_list_t>, uintptr_t, 4 > *obj_thrd_map;
+       HashTable<void *, std::vector<action_list_t> *, uintptr_t, 4 > *obj_thrd_map;
        std::vector< Promise *, SnapshotAlloc<Promise *> > *promises;
        std::vector< struct PendingFutureValue, SnapshotAlloc<struct PendingFutureValue> > *futurevalues;
 
@@ -231,6 +242,14 @@ private:
        bool asserted;
        /** @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;
 };
 
 extern ModelChecker *model;