fabi/Xenia-Canary
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XThread acquire mutants on restore

Browse Source
This commit is contained in:
Dr. Chat
2015-12-27 17:16:35 -06:00
committed by Ben Vanik
parent 5c94062110
commit bca5fb5382
3 changed files with 31 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/xenia/kernel/xthread.cc
View File

@@ -27,6 +27,7 @@
#include "xenia/kernel/kernel_state.h"
#include "xenia/kernel/user_module.h"
#include "xenia/kernel/xevent.h"
#include "xenia/kernel/xmutant.h"
DEFINE_bool(ignore_thread_priorities, true,
"Ignores game-specified thread priorities.");
@@ -1218,13 +1219,21 @@ object_ref<XThread> XThread::Restore(KernelState* kernel_state,
Clock::SetGuestTickCount(state.tick_count_);
Clock::SetGuestSystemTime(state.system_time_);
// Execute user code.
thread->running_ = true;
current_thread_tls_ = thread;
// Acquire any mutants
for (auto mutant : thread->pending_mutant_acquires_) {
uint64_t timeout = 0;
auto status = mutant->Wait(0, 0, 0, &timeout);
assert_true(status == X_STATUS_SUCCESS);
}
thread->pending_mutant_acquires_.clear();
// Execute user code.
thread->running_ = true;
uint32_t pc = state.context.pc;
thread->kernel_state()->processor()->ExecuteRaw(thread->thread_state_,
pc);
thread->kernel_state_->processor()->ExecuteRaw(thread->thread_state_, pc);
current_thread_tls_ = nullptr;