Merge pull request #1041 from Subv/duplicated_mutex

Kernel/Mutex: Don't duplicate threads in the mutex waiter list.
This commit is contained in:
bunnei 2018-08-12 22:02:03 -04:00 committed by GitHub
commit de5d431eec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 2 deletions

View File

@ -706,8 +706,7 @@ static ResultCode SignalProcessWideKey(VAddr condition_variable_addr, s32 target
Handle owner_handle = static_cast<Handle>(mutex_val & Mutex::MutexOwnerMask); Handle owner_handle = static_cast<Handle>(mutex_val & Mutex::MutexOwnerMask);
auto owner = g_handle_table.Get<Thread>(owner_handle); auto owner = g_handle_table.Get<Thread>(owner_handle);
ASSERT(owner); ASSERT(owner);
ASSERT(thread->status != ThreadStatus::Running); ASSERT(thread->status == ThreadStatus::WaitMutex);
thread->status = ThreadStatus::WaitMutex;
thread->wakeup_callback = nullptr; thread->wakeup_callback = nullptr;
owner->AddMutexWaiter(thread); owner->AddMutexWaiter(thread);

View File

@ -419,12 +419,33 @@ VAddr Thread::GetCommandBufferAddress() const {
} }
void Thread::AddMutexWaiter(SharedPtr<Thread> thread) { void Thread::AddMutexWaiter(SharedPtr<Thread> thread) {
if (thread->lock_owner == this) {
// If the thread is already waiting for this thread to release the mutex, ensure that the
// waiters list is consistent and return without doing anything.
auto itr = std::find(wait_mutex_threads.begin(), wait_mutex_threads.end(), thread);
ASSERT(itr != wait_mutex_threads.end());
return;
}
// A thread can't wait on two different mutexes at the same time.
ASSERT(thread->lock_owner == nullptr);
// Ensure that the thread is not already in the list of mutex waiters
auto itr = std::find(wait_mutex_threads.begin(), wait_mutex_threads.end(), thread);
ASSERT(itr == wait_mutex_threads.end());
thread->lock_owner = this; thread->lock_owner = this;
wait_mutex_threads.emplace_back(std::move(thread)); wait_mutex_threads.emplace_back(std::move(thread));
UpdatePriority(); UpdatePriority();
} }
void Thread::RemoveMutexWaiter(SharedPtr<Thread> thread) { void Thread::RemoveMutexWaiter(SharedPtr<Thread> thread) {
ASSERT(thread->lock_owner == this);
// Ensure that the thread is in the list of mutex waiters
auto itr = std::find(wait_mutex_threads.begin(), wait_mutex_threads.end(), thread);
ASSERT(itr != wait_mutex_threads.end());
boost::remove_erase(wait_mutex_threads, thread); boost::remove_erase(wait_mutex_threads, thread);
thread->lock_owner = nullptr; thread->lock_owner = nullptr;
UpdatePriority(); UpdatePriority();