/* Initialize default scheduler */
this->scheduler = new Scheduler();
+ num_executions = 0;
this->current_action = NULL;
this->exploring = NULL;
this->nextThread = THREAD_ID_T_NONE;
delete rootNode;
}
-void ModelChecker::assign_id(Thread *t)
+void ModelChecker::reset_to_initial_state()
{
- t->set_id(++used_thread_id);
+ DEBUG("+++ Resetting to initial state +++\n");
+ std::map<thread_id_t, class Thread *>::iterator it;
+ for (it = thread_map.begin(); it != thread_map.end(); it++) {
+ delete (*it).second;
+ }
+ thread_map.clear();
+ action_trace = new action_list_t();
+ currentNode = rootNode;
+ current_action = NULL;
+ used_thread_id = 1; // ?
+ /* scheduler reset ? */
}
-void ModelChecker::add_system_thread(Thread *t)
+int ModelChecker::get_next_id()
{
- this->system_thread = t;
+ return ++used_thread_id;
}
-Thread *ModelChecker::schedule_next_thread()
+Thread * ModelChecker::schedule_next_thread()
{
Thread *t;
if (nextThread == THREAD_ID_T_NONE)
return get_next_replay_thread();
}
-ModelAction *ModelChecker::get_last_conflict(ModelAction *act)
+bool ModelChecker::next_execution()
+{
+ num_executions++;
+ print_summary();
+ if ((exploring = model->get_next_backtrack()) == NULL)
+ return false;
+ model->reset_to_initial_state();
+ nextThread = get_next_replay_thread();
+ return true;
+}
+
+ModelAction * ModelChecker::get_last_conflict(ModelAction *act)
{
void *loc = act->get_location();
action_type type = act->get_type();
continue;
/* Conflict from the same thread is not really a conflict */
if (id == prev->get_tid())
- return NULL;
+ continue;
return prev;
}
return NULL;
backtrack_list.push_back(back);
}
+Backtrack * ModelChecker::get_next_backtrack()
+{
+ Backtrack *next;
+ if (backtrack_list.empty())
+ return NULL;
+ next = backtrack_list.back();
+ backtrack_list.pop_back();
+ return next;
+}
+
void ModelChecker::check_current_action(void)
{
ModelAction *next = this->current_action;
DEBUG("trying to push NULL action...\n");
return;
}
+ current_action = NULL;
nextThread = advance_backtracking_state();
next->set_node(currentNode);
set_backtracking(next);
this->action_trace->push_back(next);
}
-void ModelChecker::print_trace(void)
+void ModelChecker::print_summary(void)
{
action_list_t::iterator it;
printf("\n");
printf("---------------------------------------------------------------------\n");
+ printf("Number of executions: %d\n", num_executions);
printf("Total nodes created: %d\n\n", TreeNode::getTotalNodes());
scheduler->print();
- printf("\nTrace:\n\n");
+ printf("Trace:\n\n");
for (it = action_trace->begin(); it != action_trace->end(); it++) {
DBG();
int ModelChecker::add_thread(Thread *t)
{
thread_map[t->get_id()] = t;
+ scheduler->add_thread(t);
return 0;
}
+void ModelChecker::remove_thread(Thread *t)
+{
+ scheduler->remove_thread(t);
+}
+
int ModelChecker::switch_to_master(ModelAction *act)
{
- Thread *old, *next;
+ Thread *old;
DBG();
old = thread_current();
set_current_action(act);
old->set_state(THREAD_READY);
- next = system_thread;
- return old->swap(next);
+ return Thread::swap(old, get_system_context());
}
ModelAction::ModelAction(action_type_t type, memory_order order, void *loc, int value)