mika/libnx
1
0
Fork 0
mirror of https://github.com/switchbrew/libnx.git synced 2025-06-28 15:52:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use revised CondVar API in C11 threads impl

Browse Source
This commit is contained in:
fincs 2018-08-05 14:32:10 +02:00
parent 1e349b6ce8
commit b181d725ac
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nx/include/machine/_threads.h
View File

@ -2,6 +2,7 @@
#include "../switch/types.h" #include "../switch/types.h"
#include "../switch/result.h" #include "../switch/result.h"
#include "../switch/kernel/mutex.h" #include "../switch/kernel/mutex.h"
#include "../switch/kernel/condvar.h"
#include "../switch/kernel/thread.h" #include "../switch/kernel/thread.h"
#define TSS_DTOR_ITERATIONS 1 #define TSS_DTOR_ITERATIONS 1
@ -11,7 +12,7 @@ typedef struct {
int rc; int rc;
} __thrd_t; } __thrd_t;
typedef u32 cnd_t; typedef CondVar cnd_t;
typedef __thrd_t* thrd_t; typedef __thrd_t* thrd_t;
typedef u32 tss_t; typedef u32 tss_t;

17
nx/source/runtime/c11-threads.c
View File

@ -32,7 +32,7 @@ int cnd_broadcast(cnd_t *cond)
if (!cond) if (!cond)
return thrd_error; return thrd_error;
Result rc = svcSignalProcessWideKey(cond, -1); Result rc = condvarWakeAll(cond);
return R_SUCCEEDED(rc) ? thrd_success : thrd_error; return R_SUCCEEDED(rc) ? thrd_success : thrd_error;
} }
@ -46,7 +46,7 @@ int cnd_init(cnd_t *cond)
if (!cond) if (!cond)
return thrd_error; return thrd_error;
*cond = 0; condvarInit(cond);
return thrd_success; return thrd_success;
} }
@ -55,7 +55,7 @@ int cnd_signal(cnd_t *cond)
if (!cond) if (!cond)
return thrd_error; return thrd_error;
Result rc = svcSignalProcessWideKey(cond, 1); Result rc = condvarWakeOne(cond);
return R_SUCCEEDED(rc) ? thrd_success : thrd_error; return R_SUCCEEDED(rc) ? thrd_success : thrd_error;
} }
@ -64,13 +64,7 @@ static int __cnd_timedwait(cnd_t *__restrict cond, mtx_t *__restrict mtx, u64 ti
if (!cond || !mtx || mtx->type != mtx_plain) if (!cond || !mtx || mtx->type != mtx_plain)
return thrd_error; return thrd_error;
Result rc = svcWaitProcessWideKeyAtomic((u32*)&mtx->mutex, cond, getThreadVars()->handle, timeout); Result rc = condvarWaitTimeout(cond, &mtx->mutex, timeout);
// On timeout, we need to acquire it manually.
if (rc == 0xEA01) {
mutexLock(&mtx->mutex);
return thrd_busy;
}
return R_SUCCEEDED(rc) ? thrd_success : thrd_error; return R_SUCCEEDED(rc) ? thrd_success : thrd_error;
} }
@ -285,8 +279,7 @@ int thrd_sleep(const struct timespec *duration, struct timespec *remaining)
void thrd_yield(void) void thrd_yield(void)
{ {
// This is trash. svcSleepThread(-1);
svcSleepThread(10000);
} }
/* /*