return old->get_return_value();
}
-void ModelChecker::continueExecution(Thread *old)
+void ModelChecker::continueRunExecution(Thread *old)
{
+/*
if (params.traceminsize != 0 &&
execution->get_curr_seq_num() > checkfree) {
checkfree += params.checkthreshold;
execution->collectActions();
}
+*/
+ thread_chosen = false;
+ curr_thread_num = 1;
+ Thread *thr = getNextThread();
+ if (thr != nullptr) {
+ scheduler->set_current_thread(thr);
+ if (Thread::swap(old, thr) < 0) {
+ perror("swap threads");
+ exit(EXIT_FAILURE);
+ }
+ } else
+ handleChosenThread(old);
+}
+
+void ModelChecker::startRunExecution(ucontext_t *old)
+{
+/*
+ if (params.traceminsize != 0 &&
+ execution->get_curr_seq_num() > checkfree) {
+ checkfree += params.checkthreshold;
+ execution->collectActions();
+ }
+*/
thread_chosen = false;
curr_thread_num = 1;
Thread *thr = getNextThread();
scheduler->sleep(thr);
}
- chooseThread(act, thr);
+// chooseThread(act, thr);
}
return nextThread;
}
-void ModelChecker::finishExecution(Thread *old)
+void ModelChecker::finishRunExecution(Thread *old)
{
scheduler->set_current_thread(NULL);
if (Thread::swap(old, &system_context) < 0) {
}
}
+void ModelChecker::finishRunExecution(ucontext_t *old)
+{
+ scheduler->set_current_thread(NULL);
+}
+
void ModelChecker::consumeAction()
{
ModelAction *curr = chosen_thread->get_pending();
if (act2 && execution->is_enabled(old) && !execution->check_action_enabled(act2)) {
scheduler->sleep(old);
}
- chooseThread(act2, old);
+// chooseThread(act2, old);
curr_thread_num++;
Thread* next = getNextThread();
if (next != nullptr)
handleNewValidThread(old, next);
- else
+ else {
+ old->set_state(THREAD_READY); // Just to avoid the first ASSERT in ModelExecution::take_step
handleChosenThread(old);
+ }
return old->get_return_value();
}
void ModelChecker::handleChosenThread(Thread *old)
{
if (execution->has_asserted())
- finishExecution(old);
+ finishRunExecution(old);
if (!chosen_thread)
chosen_thread = get_next_thread();
if (!chosen_thread || chosen_thread->is_model_thread())
- finishExecution(old);
+ finishRunExecution(old);
if (chosen_thread->just_woken_up()) {
chosen_thread->set_wakeup_state(false);
chosen_thread->set_pending(NULL);
chosen_thread = NULL;
// Allow this thread to stash the next pending action
if (should_terminate_execution())
- finishExecution(old);
+ finishRunExecution(old);
else
- continueExecution(old);
+ continueRunExecution(old);
} else {
/* Consume the next action for a Thread */
consumeAction();
if (should_terminate_execution())
- finishExecution(old);
+ finishRunExecution(old);
else
- continueExecution(old);
+ continueRunExecution(old);
}
}
+void ModelChecker::handleChosenThread(ucontext_t *old)
+{
+ if (execution->has_asserted())
+ finishRunExecution(old);
+ if (!chosen_thread)
+ chosen_thread = get_next_thread();
+ if (!chosen_thread || chosen_thread->is_model_thread())
+ finishRunExecution(old);
+/* if (chosen_thread->just_woken_up()) {
+ chosen_thread->set_wakeup_state(false);
+ chosen_thread->set_pending(NULL);
+ chosen_thread = NULL;
+ // Allow this thread to stash the next pending action
+ if (should_terminate_execution())
+ finishRunExecution(old);
+ else
+ startRunExecution(old);
+ } else*/
+
+ {
+ /* Consume the next action for a Thread */
+ consumeAction();
+
+ if (should_terminate_execution())
+ finishRunExecution(old);
+ else
+ startRunExecution(old);
+ }
+}
+
+
static void runChecker() {
model->run();
delete model;
checkfree = params.checkthreshold;
for(int exec = 0;exec < params.maxexecutions;exec++) {
chosen_thread = init_thread;
- thread_chosen = false;
- curr_thread_num = 1;
- thread_id_t tid = int_to_id(1);
- Thread *thr = get_thread(tid);
- if (!thr->get_pending())
- switch_from_master(thr);
- else {
- consumeAction();
- switch_from_master(thr);
- }
+ do {
+ thread_chosen = false;
+ curr_thread_num = 1;
+ startRunExecution(&system_context);
+ } while (!should_terminate_execution());
+
finish_execution((exec+1) < params.maxexecutions);
//restore random number generator state after rollback
setstate(random_state);