N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Mutex: Fix a bug where the thread should not wait if it already has the mutex.

Browse source
This commit is contained in:
bunnei 2015-01-18 15:45:01 -05:00
parent 9412996c8f
commit dde02f79af
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/core/hle/kernel/mutex.cpp
View file

@ -25,6 +25,7 @@ public:
bool locked; ///< Current locked state bool locked; ///< Current locked state
Handle lock_thread; ///< Handle to thread that currently has mutex Handle lock_thread; ///< Handle to thread that currently has mutex
std::string name; ///< Name of mutex (optional) std::string name; ///< Name of mutex (optional)
SharedPtr<Thread> current_thread; ///< Thread that has acquired the mutex
ResultVal<bool> Wait() override; ResultVal<bool> Wait() override;
ResultVal<bool> Acquire() override; ResultVal<bool> Acquire() override;
@ -43,6 +44,7 @@ static MutexMap g_mutex_held_locks;
void MutexAcquireLock(Mutex* mutex, Handle thread = GetCurrentThread()->GetHandle()) { void MutexAcquireLock(Mutex* mutex, Handle thread = GetCurrentThread()->GetHandle()) {
g_mutex_held_locks.insert(std::make_pair(thread, mutex->GetHandle())); g_mutex_held_locks.insert(std::make_pair(thread, mutex->GetHandle()));
mutex->lock_thread = thread; mutex->lock_thread = thread;
mutex->current_thread = Kernel::g_handle_table.Get<Thread>(thread);
} }
/** /**
@ -132,6 +134,7 @@ Mutex* CreateMutex(Handle& handle, bool initial_locked, const std::string& name)
mutex->locked = mutex->initial_locked = initial_locked; mutex->locked = mutex->initial_locked = initial_locked;
mutex->name = name; mutex->name = name;
mutex->current_thread = nullptr;
// Acquire mutex with current thread if initialized as locked... // Acquire mutex with current thread if initialized as locked...
if (mutex->locked) { if (mutex->locked) {
@ -157,7 +160,7 @@ Handle CreateMutex(bool initial_locked, const std::string& name) {
} }
ResultVal<bool> Mutex::Wait() { ResultVal<bool> Mutex::Wait() {
return MakeResult<bool>(locked); return MakeResult<bool>(locked && (current_thread != GetCurrentThread()));
} }
ResultVal<bool> Mutex::Acquire() { ResultVal<bool> Mutex::Acquire() {