ModelChecker *model;
/** @brief Constructor */
-ModelChecker::ModelChecker()
- :
+ModelChecker::ModelChecker() :
/* Initialize default scheduler */
scheduler(new Scheduler()),
/* First thread created will have id INITIAL_THREAD_ID */
/** @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;
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;
if (!already_added)
add_action_to_lists(curr);
- /* Is there a better interface for setting the next thread rather
+ /** @todo Is there a better interface for setting the next thread rather
than this field/convoluted approach? Perhaps like just returning
it or something? */
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;
printf("---------------------------------------------------------------------\n");
}
-void ModelChecker::print_summary(void)
+void ModelChecker::print_summary(bool feasible)
{
printf("\n");
printf("Number of executions: %d\n", num_executions);
scheduler->print();
- if (!isfinalfeasible())
+ if (!feasible)
printf("INFEASIBLE EXECUTION!\n");
print_list(action_trace);
printf("\n");