artemist/yuzu
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #4590 from ReinUsesLisp/tsan-sched

Browse source 
hle/scheduler: Fix data race in is_context_switch_pending
This commit is contained in:
bunnei 2020-09-03 14:39:57 -04:00 committed by GitHub
parent 39319f09d8 ccdd84a778
commit ba5419b965
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/hle/kernel/scheduler.cpp
View file

@ -756,7 +756,11 @@ void Scheduler::SwitchToCurrent() {
current_thread = selected_thread; current_thread = selected_thread;
is_context_switch_pending = false; is_context_switch_pending = false;
} }
while (!is_context_switch_pending) { const auto is_switch_pending = [this] {
std::scoped_lock lock{guard};
return is_context_switch_pending;
};
do {
if (current_thread != nullptr && !current_thread->IsHLEThread()) { if (current_thread != nullptr && !current_thread->IsHLEThread()) {
current_thread->context_guard.lock(); current_thread->context_guard.lock();
if (!current_thread->IsRunnable()) { if (!current_thread->IsRunnable()) {
@ -775,7 +779,7 @@ void Scheduler::SwitchToCurrent() {
next_context = &idle_thread->GetHostContext(); next_context = &idle_thread->GetHostContext();
} }
Common::Fiber::YieldTo(switch_fiber, *next_context); Common::Fiber::YieldTo(switch_fiber, *next_context);
} } while (!is_switch_pending());
} }
} }