GitHub/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-12-28 22:25:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Don't block while inserting paused threads

Browse Source 
Blocking while inserting a paused thread can lead to deadlocks where the inserting thread later resumes the paused thread.

Co-authored-by: Billy Laws <blaws05@gmail.com>
This commit is contained in:
PixelyIon 2022-11-28 23:33:15 +05:30 committed by Mark Collins
parent 643f4cf864
commit 6645692288
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/cpp/skyline/kernel/scheduler.cpp
View File

@ -91,9 +91,9 @@ namespace skyline::kernel {
std::unique_lock lock{core.mutex}; std::unique_lock lock{core.mutex};
if (thread->isPaused) { if (thread->isPaused) {
// We cannot insert a thread that is paused, so we need to wait until it has been resumed // We cannot insert a thread that is paused, so we just let the resuming thread insert it
thread->insertThreadOnResume = false; thread->insertThreadOnResume = true;
thread->scheduleCondition.wait(lock, [&]() { return !thread->isPaused; }); return;
} }
#ifndef NDEBUG #ifndef NDEBUG

1
app/src/main/cpp/skyline/kernel/scheduler.h
View File

@ -87,6 +87,7 @@ namespace skyline {
/** /**
* @brief Inserts the specified thread into the scheduler queue at the appropriate location based on its priority * @brief Inserts the specified thread into the scheduler queue at the appropriate location based on its priority
* @note This is a non-blocking operation when the thread is paused, the thread will only be inserted when it is resumed
*/ */
void InsertThread(const std::shared_ptr<type::KThread> &thread); void InsertThread(const std::shared_ptr<type::KThread> &thread);