summaryrefslogtreecommitdiffstats
path: root/src/core/hle/kernel/mutex.cpp
diff options
context:
space:
mode:
authorYuri Kunde Schlesner <yuriks@yuriks.net>2014-12-22 14:07:22 +0100
committerYuri Kunde Schlesner <yuriks@yuriks.net>2015-01-09 07:02:15 +0100
commit9bf8462b96d34b30f62b8aca745dd558e7f0a450 (patch)
tree32606d5176a82daa4e59bb47bede34d4a941780a /src/core/hle/kernel/mutex.cpp
parentKernel: Move Thread's definition to the header file (diff)
downloadyuzu-9bf8462b96d34b30f62b8aca745dd558e7f0a450.tar
yuzu-9bf8462b96d34b30f62b8aca745dd558e7f0a450.tar.gz
yuzu-9bf8462b96d34b30f62b8aca745dd558e7f0a450.tar.bz2
yuzu-9bf8462b96d34b30f62b8aca745dd558e7f0a450.tar.lz
yuzu-9bf8462b96d34b30f62b8aca745dd558e7f0a450.tar.xz
yuzu-9bf8462b96d34b30f62b8aca745dd558e7f0a450.tar.zst
yuzu-9bf8462b96d34b30f62b8aca745dd558e7f0a450.zip
Diffstat (limited to 'src/core/hle/kernel/mutex.cpp')
-rw-r--r--src/core/hle/kernel/mutex.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/src/core/hle/kernel/mutex.cpp b/src/core/hle/kernel/mutex.cpp
index 3dfeffc9b..7d008f6cc 100644
--- a/src/core/hle/kernel/mutex.cpp
+++ b/src/core/hle/kernel/mutex.cpp
@@ -40,14 +40,21 @@ static MutexMap g_mutex_held_locks;
* @param mutex Mutex that is to be acquired
* @param thread Thread that will acquired
*/
-void MutexAcquireLock(Mutex* mutex, Handle thread = GetCurrentThreadHandle()) {
+void MutexAcquireLock(Mutex* mutex, Handle thread = GetCurrentThread()->GetHandle()) {
g_mutex_held_locks.insert(std::make_pair(thread, mutex->GetHandle()));
mutex->lock_thread = thread;
}
-bool ReleaseMutexForThread(Mutex* mutex, Handle thread) {
- MutexAcquireLock(mutex, thread);
- Kernel::ResumeThreadFromWait(thread);
+bool ReleaseMutexForThread(Mutex* mutex, Handle thread_handle) {
+ MutexAcquireLock(mutex, thread_handle);
+
+ Thread* thread = Kernel::g_handle_table.Get<Thread>(thread_handle);
+ if (thread == nullptr) {
+ LOG_ERROR(Kernel, "Called with invalid handle: %08X", thread_handle);
+ return false;
+ }
+
+ thread->ResumeFromWait();
return true;
}
@@ -168,8 +175,8 @@ Handle CreateMutex(bool initial_locked, const std::string& name) {
ResultVal<bool> Mutex::WaitSynchronization() {
bool wait = locked;
if (locked) {
- waiting_threads.push_back(GetCurrentThreadHandle());
- Kernel::WaitCurrentThread(WAITTYPE_MUTEX, GetHandle());
+ waiting_threads.push_back(GetCurrentThread()->GetHandle());
+ Kernel::WaitCurrentThread(WAITTYPE_MUTEX, this);
} else {
// Lock the mutex when the first thread accesses it
locked = true;