emu-mirror/citra-canary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #225 from bunnei/fix-release-mutex

Browse Source 
Mutex: Changed behavior to always release mutex for all threads.
This commit is contained in:
bunnei 2014-11-30 08:47:49 -05:00
commit e3d1ffff4b
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/core/hle/kernel/mutex.cpp
View File

@ -88,20 +88,19 @@ bool ReleaseMutexForThread(Mutex* mutex, Handle thread) {
bool ReleaseMutex(Mutex* mutex) { bool ReleaseMutex(Mutex* mutex) {
MutexEraseLock(mutex); MutexEraseLock(mutex);
bool woke_threads = false;
// Find the next waiting thread for the mutex... // Find the next waiting thread for the mutex...
while (!woke_threads && !mutex->waiting_threads.empty()) { while (!mutex->waiting_threads.empty()) {
std::vector<Handle>::iterator iter = mutex->waiting_threads.begin(); std::vector<Handle>::iterator iter = mutex->waiting_threads.begin();
woke_threads |= ReleaseMutexForThread(mutex, *iter); ReleaseMutexForThread(mutex, *iter);
mutex->waiting_threads.erase(iter); mutex->waiting_threads.erase(iter);
} }
// Reset mutex lock thread handle, nothing is waiting // Reset mutex lock thread handle, nothing is waiting
if (!woke_threads) {
mutex->locked = false; mutex->locked = false;
mutex->lock_thread = -1; mutex->lock_thread = -1;
}
return woke_threads; return true;
} }
/** /**