mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-07-05 17:12:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge ffb2dd4f11 into 28e4d4411d

Browse Source
This commit is contained in:
Ren Kimura 2018-09-08 15:30:03 +00:00 committed by GitHub
commit 19a9069120
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stratosphere/libstratosphere/include/stratosphere/hossynch.hpp
View File

@ -45,15 +45,12 @@ class HosRecursiveMutex {
HosRecursiveMutex() { HosRecursiveMutex() {
rmutexInit(&this->m); rmutexInit(&this->m);
} }
void lock() { void lock() {
rmutexLock(&this->m); rmutexLock(&this->m);
} }
void unlock() { void unlock() {
rmutexUnlock(&this->m); rmutexUnlock(&this->m);
} }
bool try_lock() { bool try_lock() {
return rmutexTryLock(&this->m); return rmutexTryLock(&this->m);
} }
@ -66,15 +63,15 @@ class HosCondVar {
public: public:
HosCondVar() { HosCondVar() {
mutexInit(&m); mutexInit(&m);
condvarInit(&cv, &m); condvarInit(&cv);
} }
Result WaitTimeout(u64 timeout) { Result WaitTimeout(u64 timeout) {
return condvarWaitTimeout(&cv, timeout); return condvarWaitTimeout(&cv, &m, timeout);
} }
Result Wait() { Result Wait() {
return condvarWait(&cv); return condvarWait(&cv, &m);
} }
Result Wake(int num) { Result Wake(int num) {
@ -99,12 +96,12 @@ class HosSemaphore {
HosSemaphore() { HosSemaphore() {
count = 0; count = 0;
mutexInit(&m); mutexInit(&m);
condvarInit(&cv, &m); condvarInit(&cv);
} }
HosSemaphore(u64 c) : count(c) { HosSemaphore(u64 c) : count(c) {
mutexInit(&m); mutexInit(&m);
condvarInit(&cv, &m); condvarInit(&cv);
} }
void Signal() { void Signal() {
@ -117,7 +114,7 @@ class HosSemaphore {
void Wait() { void Wait() {
mutexLock(&this->m); mutexLock(&this->m);
while (!count) { while (!count) {
condvarWait(&cv); condvarWait(&cv, &m);
} }
count--; count--;
mutexUnlock(&this->m); mutexUnlock(&this->m);