INSANEMODE/yuzu-android
1
0
Fork 0
mirror of https://github.com/yuzu-emu/yuzu-android.git synced 2025-06-13 08:58:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Kernel: Separate WaitSynchronization into Wait and Acquire methods.

Browse Source
This commit is contained in:
bunnei
2015-01-17 22:23:49 -05:00
parent 627e96fc15
commit aa01c57ae9
8 changed files with 59 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,8 @@ public:
Handle lock_thread; ///< Handle to thread that currently has mutex
std::string name; ///< Name of mutex (optional)
ResultVal<bool> WaitSynchronization(unsigned index) override;
ResultVal<bool> Wait(unsigned index) override;
ResultVal<bool> Acquire() override;
};
////////////////////////////////////////////////////////////////////////////////////////////////////
@ -155,17 +156,25 @@ Handle CreateMutex(bool initial_locked, const std::string& name) {
return handle;
}
ResultVal<bool> Mutex::WaitSynchronization(unsigned index) {
bool wait = locked;
ResultVal<bool> Mutex::Wait(unsigned index) {
if (locked) {
AddWaitingThread(GetCurrentThread());
Kernel::WaitCurrentThread_WaitSynchronization(WAITTYPE_MUTEX, this, index);
} else {
}
return MakeResult<bool>(locked);
}
ResultVal<bool> Mutex::Acquire() {
bool res = false;
if (!locked) {
// Lock the mutex when the first thread accesses it
locked = true;
res = true;
MutexAcquireLock(this);
}
return MakeResult<bool>(wait);
return MakeResult<bool>(res);
}
} // namespace