ryujinx/SDL
1
0
Fork 0
mirror of https://github.com/Ryujinx/SDL.git synced 2024-12-23 06:45:32 +00:00
Code Issues 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 12:53:14 +00:00 committed by Sam Lantinga
parent 3a8032f491
commit 557d8e2f24
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 "SDL_error.h" #include "SDL_error.h"
#include "SDL_thread.h" #include "SDL_thread.h"
@ -38,11 +38,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_sem *SDL_CreateSemaphore(Uint32 initial_value) SDL_sem *SDL_CreateSemaphore(Uint32 initial_value)
{ {
@ -85,8 +80,8 @@ void SDL_DestroySemaphore(SDL_sem *sem)
int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout) int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout)
{ {
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");
@ -99,12 +94,14 @@ int SDL_SemWaitTimeout(SDL_sem *sem, Uint32 timeout)
return 0; return 0;
} }
timeout_ptr = NULL;
if (timeout != SDL_MUTEX_MAXWAIT) { if (timeout != SDL_MUTEX_MAXWAIT) {
SetTimerAlarm(&alarm, MSec2TimerBusClock(timeout), &usercb, (void *)GetThreadId()); timeout_usec = timeout * 1000;
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;