model: rename print_trace() -> print_summary(), fixup summary printing

diff --git a/model.cc b/model.cc
index fc0f13d886bfb6e0139c6f5999b0bd0aaf1becaf..9d23788e8939746cd8bf720e2c8ece25e46f8ae7 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -112,6 +112,7 @@ thread_id_t ModelChecker::advance_backtracking_state()
 bool ModelChecker::next_execution()
 {
        num_executions++;
+       print_summary();
        if ((exploring = model->get_next_backtrack()) == NULL)
                return false;
        model->reset_to_initial_state();
@@ -203,7 +204,7 @@ void ModelChecker::check_current_action(void)
        this->action_trace->push_back(next);
 }
 
-void ModelChecker::print_trace(void)
+void ModelChecker::print_summary(void)
 {
        action_list_t::iterator it;
 

diff --git a/model.h b/model.h
index 8cfd66f7e3d9dc896e9531fe884e6f74d9ea52a3..80a27aaebae6385842ccda77d1534c4537e789c1 100644 (file)
--- a/model.h
+++ b/model.h
@@ -75,7 +75,7 @@ public:
 
        void set_current_action(ModelAction *act) { current_action = act; }
        void check_current_action(void);
-       void print_trace(void);
+       void print_summary(void);
        Thread * schedule_next_thread();
 
        int add_thread(Thread *t);

diff --git a/threads.cc b/threads.cc
index 7e23f59dcf902fd4693e9fea34e81439e7a518ef..456414d5b3200ec1ca8b7603834e78c761910b76 100644 (file)
--- a/threads.cc
+++ b/threads.cc
@@ -158,8 +158,6 @@ int main()
 
                /* Wait for all threads to complete */
                thread_wait_finish();
-
-               model->print_trace();
        } while (model->next_execution());
 
        delete th;