model: refactor end-of-execution output

[c11tester.git] / model.h

diff --git a/model.h b/model.h
index 58ee152aa7ce94c6ae84f7d14bdec5d6894447ce..0d27d5a305d1830b75ac3519e294816f85bc88de 100644 (file)
--- a/model.h
+++ b/model.h
@@ -47,6 +47,9 @@ struct model_params {
         *  expiration time exceeds the existing one by more than the slop
         *  value */
        unsigned int expireslop;
+
+       /** @brief Verbosity (0 = quiet; 1 = noisy) */
+       int verbose;
 };
 
 /** @brief Model checker execution stats */
@@ -84,8 +87,7 @@ public:
        /** @returns the context for the main model-checking system thread */
        ucontext_t * get_system_context() { return &system_context; }
 
-       /** Prints an execution summary with trace information. */
-       void print_summary();
+       void print_summary() const;
 #if SUPPORT_MOD_ORDER_DUMP
        void dumpGraph(char *filename);
 #endif
@@ -116,13 +118,13 @@ 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;
        bool is_complete_execution() const;
+       void print_stats() const;
 
        /** @brief Alert the model-checker that an incorrectly-ordered
         * synchronization was made */
@@ -247,10 +249,10 @@ private:
        /** @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;
+       void print_execution(bool printbugs) const;
 };
 
 extern ModelChecker *model;