history(new ModelHistory()),
execution(new ModelExecution(this, scheduler)),
execution_number(1),
+ curr_thread_num(1),
trace_analyses(),
inspect_plugin(NULL)
{
return scheduler->get_current_thread();
}
+/**
+ * Must be called from user-thread context (e.g., through the global
+ * thread_current_id() interface)
+ *
+ * @return The id of the currently executing Thread.
+ */
+thread_id_t ModelChecker::get_current_thread_id() const
+{
+ ASSERT(int_to_id(curr_thread_num) == get_current_thread()->get_id());
+ return int_to_id(curr_thread_num);
+}
+
/**
* @brief Choose the next thread to execute.
*
execution->collectActions();
}
- thread_chosen = false;
curr_thread_num = 1;
-
- Thread *thr = getNextThread();
+ Thread *thr = getNextThread(old);
if (thr != nullptr) {
scheduler->set_current_thread(thr);
return;
}
- if (execution->has_asserted()) {
- finishRunExecution(old);
- return;
- }
- if (!chosen_thread)
- chosen_thread = get_next_thread();
- if (!chosen_thread || chosen_thread->is_model_thread()) {
- finishRunExecution(old);
- return;
- }
- 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
- continue;
- }
-
- /* Consume the next action for a Thread */
- consumeAction();
-
- if (should_terminate_execution()) {
- finishRunExecution(old);
+ if (!handleChosenThread(old)) {
return;
}
}
}
-Thread* ModelChecker::getNextThread()
+Thread* ModelChecker::getNextThread(Thread *old)
{
Thread *nextThread = nullptr;
for (unsigned int i = curr_thread_num;i < get_num_threads();i++) {
thread_id_t tid = int_to_id(i);
Thread *thr = get_thread(tid);
- if (!thr->is_complete() && !thr->get_pending()) {
- curr_thread_num = i;
- nextThread = thr;
- break;
+ if (!thr->is_complete()) {
+ if (!thr->get_pending()) {
+ curr_thread_num = i;
+ nextThread = thr;
+ break;
+ }
+ } else if (thr != old && !thr->is_freed()) {
+ thr->freeResources();
}
- /* Don't schedule threads which should be disabled */
ModelAction *act = thr->get_pending();
- if (act && execution->is_enabled(thr) && !execution->check_action_enabled(act)) {
- scheduler->sleep(thr);
+ if (act && execution->is_enabled(tid)){
+ /* Don't schedule threads which should be disabled */
+ if (!execution->check_action_enabled(act)) {
+ scheduler->sleep(thr);
+ }
+
+ /* Allow pending relaxed/release stores or thread actions to perform first */
+ else if (!chosen_thread) {
+ if (act->is_write()) {
+ std::memory_order order = act->get_mo();
+ if (order == std::memory_order_relaxed || \
+ order == std::memory_order_release) {
+ chosen_thread = thr;
+ }
+ } else if (act->get_type() == THREAD_CREATE || \
+ act->get_type() == PTHREAD_CREATE || \
+ act->get_type() == THREAD_START || \
+ act->get_type() == THREAD_FINISH) {
+ chosen_thread = thr;
+ }
+ }
}
- chooseThread(act, thr);
}
return nextThread;
}
{
scheduler->set_current_thread(NULL);
+ /** Reset curr_thread_num to initial value for next execution. */
+ curr_thread_num = 1;
+
/** If we have more executions, we won't make it past this call. */
finish_execution(execution_number < params.maxexecutions);
_Exit(0);
}
-void ModelChecker::consumeAction()
-{
- ModelAction *curr = chosen_thread->get_pending();
- Thread * th = thread_current();
- chosen_thread->set_pending(NULL);
- chosen_thread = execution->take_step(curr);
-}
-
-/* Allow pending relaxed/release stores or thread actions to perform first */
-void ModelChecker::chooseThread(ModelAction *act, Thread *thr)
-{
- if (!thread_chosen && act && execution->is_enabled(thr) && (thr->get_state() != THREAD_BLOCKED) ) {
- if (act->is_write()) {
- std::memory_order order = act->get_mo();
- if (order == std::memory_order_relaxed || \
- order == std::memory_order_release) {
- chosen_thread = thr;
- thread_chosen = true;
- }
- } else if (act->get_type() == THREAD_CREATE || \
- act->get_type() == PTHREAD_CREATE || \
- act->get_type() == THREAD_START || \
- act->get_type() == THREAD_FINISH) {
- chosen_thread = thr;
- thread_chosen = true;
- }
- }
-}
-
uint64_t ModelChecker::switch_thread(ModelAction *act)
{
if (modellock) {
}
DBG();
Thread *old = thread_current();
+ old->set_state(THREAD_READY);
+
ASSERT(!old->get_pending());
if (inspect_plugin != NULL) {
if (old->is_waiting_on(old))
assert_bug("Deadlock detected (thread %u)", curr_thread_num);
- if (act && execution->is_enabled(old) && !execution->check_action_enabled(act)) {
- scheduler->sleep(old);
- }
- chooseThread(act, old);
-
- curr_thread_num++;
- Thread* next = getNextThread();
+ Thread* next = getNextThread(old);
if (next != nullptr) {
scheduler->set_current_thread(next);
if (Thread::swap(old, next) < 0) {
perror("swap threads");
exit(EXIT_FAILURE);
}
- } else
- handleChosenThread(old);
-
+ } else {
+ if (handleChosenThread(old)) {
+ startRunExecution(old);
+ }
+ }
return old->get_return_value();
}
-void ModelChecker::handleChosenThread(Thread *old)
+bool ModelChecker::handleChosenThread(Thread *old)
{
if (execution->has_asserted()) {
finishRunExecution(old);
- return;
+ return false;
}
- if (!chosen_thread)
+ if (!chosen_thread) {
chosen_thread = get_next_thread();
- if (!chosen_thread || chosen_thread->is_model_thread()) {
+ }
+ if (!chosen_thread) {
finishRunExecution(old);
- return;
+ return false;
}
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
- startRunExecution(old);
- return;
+ return true;
}
// Consume the next action for a Thread
- consumeAction();
+ ModelAction *curr = chosen_thread->get_pending();
+ chosen_thread->set_pending(NULL);
+ chosen_thread = execution->take_step(curr);
if (should_terminate_execution()) {
finishRunExecution(old);
- return;
- } else
- startRunExecution(old);
+ return false;
+ } else {
+ return true;
+ }
}
void ModelChecker::startChecker() {
projects / c11tester.git / blobdiff