shadps4-emu/ext-SDL
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-SDL.git synced 2024-10-07 08:23:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PS2 use WaitSemaEx for waiting for semaphore with timeout

Browse Source
This commit is contained in:
Julian Uy 2023-12-24 14:49:23 +00:00 committed by Sam Lantinga
parent bb0e0ae080
commit 4914e5bb78
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/thread/ps2/SDL_syssem.c
View File

@ -26,7 +26,7 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <timer_alarm.h> #include <kernel_util.h>
#include <kernel.h> #include <kernel.h>
@ -35,11 +35,6 @@ struct SDL_Semaphore
s32 semid; s32 semid;
}; };
static void usercb(struct timer_alarm_t *alarm, void *arg)
{
iReleaseWaitThread((int)arg);
}
/* Create a semaphore */ /* Create a semaphore */
SDL_Semaphore *SDL_CreateSemaphore(Uint32 initial_value) SDL_Semaphore *SDL_CreateSemaphore(Uint32 initial_value)
{ {
@ -80,8 +75,8 @@ void SDL_DestroySemaphore(SDL_Semaphore *sem)
int SDL_WaitSemaphoreTimeoutNS(SDL_Semaphore *sem, Sint64 timeoutNS) int SDL_WaitSemaphoreTimeoutNS(SDL_Semaphore *sem, Sint64 timeoutNS)
{ {
int ret; int ret;
struct timer_alarm_t alarm; u64 timeout_usec;
InitializeTimerAlarm(&alarm); u64 *timeout_ptr;
if (!sem) { if (!sem) {
return SDL_InvalidParamError("sem"); return SDL_InvalidParamError("sem");
@ -94,12 +89,14 @@ int SDL_WaitSemaphoreTimeoutNS(SDL_Semaphore *sem, Sint64 timeoutNS)
return 0; return 0;
} }
timeout_ptr = NULL;
if (timeoutNS != -1) { // -1 == wait indefinitely. if (timeoutNS != -1) { // -1 == wait indefinitely.
SetTimerAlarm(&alarm, MSec2TimerBusClock(SDL_NS_TO_MS(timeoutNS)), &usercb, (void *)GetThreadId()); timeout_usec = SDL_NS_TO_US(timeoutNS);
timeout_ptr = &timeout_usec;
} }
ret = WaitSema(sem->semid); ret = WaitSemaEx(sem->semid, 1, timeout_ptr);
StopTimerAlarm(&alarm);
if (ret < 0) { if (ret < 0) {
return SDL_MUTEX_TIMEDOUT; return SDL_MUTEX_TIMEDOUT;