mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-21 04:22:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into release-411

Browse Source
This commit is contained in:
fincs 2021-06-21 17:49:11 +02:00
commit 5f8f4dcb5e
No known key found for this signature in database
GPG Key ID: 62C7609ADA219C60
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nx/Makefile
View File

@ -10,7 +10,7 @@ include $(DEVKITPRO)/devkitA64/base_rules
export LIBNX_MAJOR := 4
export LIBNX_MINOR := 1
export LIBNX_PATCH := 0
export LIBNX_PATCH := 1
VERSION := $(LIBNX_MAJOR).$(LIBNX_MINOR).$(LIBNX_PATCH)

2
nx/include/switch/sf/sessionmgr.h
View File

@ -12,7 +12,7 @@ typedef struct SessionMgr
u32 free_mask;
Mutex mutex;
CondVar condvar;
bool is_waiting;
u32 num_waiters;
} SessionMgr;
Result sessionmgrCreate(SessionMgr* mgr, Handle root_session, u32 num_sessions);

7
nx/source/sf/sessionmgr.c
View File

@ -43,8 +43,9 @@ int sessionmgrAttachClient(SessionMgr* mgr) {
for (;;) {
slot = __builtin_ffs(mgr->free_mask)-1;
if (slot >= 0) break;
mgr->is_waiting = true;
mgr->num_waiters ++;
condvarWait(&mgr->condvar, &mgr->mutex);
mgr->num_waiters --;
}
mgr->free_mask &= ~(1U << slot);
mutexUnlock(&mgr->mutex);
@ -54,9 +55,7 @@ int sessionmgrAttachClient(SessionMgr* mgr) {
void sessionmgrDetachClient(SessionMgr* mgr, int slot) {
mutexLock(&mgr->mutex);
mgr->free_mask |= 1U << slot;
if (mgr->is_waiting) {
mgr->is_waiting = false;
if (mgr->num_waiters)
condvarWakeOne(&mgr->condvar);
}
mutexUnlock(&mgr->mutex);
}