Makefile: fix config.h dependencies

[model-checker.git] / model.cc

diff --git a/model.cc b/model.cc
index b456c246468cd7d5674e65bfe42ff2cd4a348462..8f8bd88baad9147aeb205829d820eaaad3a28d8c 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -41,9 +41,8 @@ ModelChecker::ModelChecker() :
 /** @brief Destructor */
 ModelChecker::~ModelChecker()
 {
-       /*      std::map<int, Thread *>::iterator it;
-       for (it = thread_map->begin(); it != thread_map->end(); it++)
-       delete (*it).second;*/
+       for (int i = 0; i < get_num_threads(); i++)
+               delete thread_map->get(i);
        delete thread_map;
 
        delete obj_thrd_map;
@@ -172,8 +171,9 @@ bool ModelChecker::next_execution()
 
        num_executions++;
 
-       if (isfinalfeasible() || DBG_ENABLED())
-               print_summary();
+       bool feasible = isfinalfeasible();
+       if (feasible || DBG_ENABLED())
+               print_summary(feasible);
 
        if ((diverge = model->get_next_backtrack()) == NULL)
                return false;
@@ -353,7 +353,8 @@ void ModelChecker::check_current_action(void)
        Node *currnode = curr->get_node();
        Node *parnode = currnode->get_parent();
 
-       if (!parnode->backtrack_empty()||!currnode->read_from_empty()||!currnode->future_value_empty()||!currnode->promise_empty())
+       if (!parnode->backtrack_empty() || !currnode->read_from_empty() ||
+                 !currnode->future_value_empty() || !currnode->promise_empty())
                if (!next_backtrack || *curr > *next_backtrack)
                        next_backtrack = curr;
 
@@ -705,7 +706,7 @@ static void print_list(action_list_t *list)
        printf("---------------------------------------------------------------------\n");
 }
 
-void ModelChecker::print_summary(void)
+void ModelChecker::print_summary(bool feasible)
 {
        printf("\n");
        printf("Number of executions: %d\n", num_executions);
@@ -713,7 +714,7 @@ void ModelChecker::print_summary(void)
 
        scheduler->print();
 
-       if (!isfinalfeasible())
+       if (!feasible)
                printf("INFEASIBLE EXECUTION!\n");
        print_list(action_trace);
        printf("\n");