mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-07 11:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always use WaitForSingleObjectEx() as a fallback in SDL_SYS_DelayNS()

Browse Source 
That logic isn't specific to the Visual Studio build environment. Also switched it to use CreateEvent(), which works back to Windows XP.
This commit is contained in:
Sam Lantinga
2024-10-11 21:00:09 -07:00
parent c5904d8710
commit c6c195ff88
1 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/timer/windows/SDL_systimer.c
View File

@@ -25,13 +25,13 @@
#include "../../core/windows/SDL_windows.h" #include "../../core/windows/SDL_windows.h"
#ifdef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION static void SDL_CleanupWaitableHandle(void *handle)
static void SDL_CleanupWaitableTimer(void *timer)
{ {
CloseHandle(timer); CloseHandle(handle);
} }
HANDLE SDL_GetWaitableTimer(void) #ifdef CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
static HANDLE SDL_GetWaitableTimer(void)
{ {
static SDL_TLSID TLS_timer_handle; static SDL_TLSID TLS_timer_handle;
HANDLE timer; HANDLE timer;
@@ -40,13 +40,28 @@ HANDLE SDL_GetWaitableTimer(void)
if (!timer) { if (!timer) {
timer = CreateWaitableTimerExW(NULL, NULL, CREATE_WAITABLE_TIMER_HIGH_RESOLUTION, TIMER_ALL_ACCESS); timer = CreateWaitableTimerExW(NULL, NULL, CREATE_WAITABLE_TIMER_HIGH_RESOLUTION, TIMER_ALL_ACCESS);
if (timer) { if (timer) {
SDL_SetTLS(&TLS_timer_handle, timer, SDL_CleanupWaitableTimer); SDL_SetTLS(&TLS_timer_handle, timer, SDL_CleanupWaitableHandle);
} }
} }
return timer; return timer;
} }
#endif // CREATE_WAITABLE_TIMER_HIGH_RESOLUTION #endif // CREATE_WAITABLE_TIMER_HIGH_RESOLUTION
static HANDLE SDL_GetWaitableEvent(void)
{
static SDL_TLSID TLS_event_handle;
HANDLE event;
event = SDL_GetTLS(&TLS_event_handle);
if (!event) {
event = CreateEvent(NULL, FALSE, FALSE, NULL);
if (event) {
SDL_SetTLS(&TLS_event_handle, event, SDL_CleanupWaitableHandle);
}
}
return event;
}
Uint64 SDL_GetPerformanceCounter(void) Uint64 SDL_GetPerformanceCounter(void)
{ {
LARGE_INTEGER counter; LARGE_INTEGER counter;
@@ -81,22 +96,19 @@ void SDL_SYS_DelayNS(Uint64 ns)
} }
#endif #endif
{ const Uint64 max_delay = 0xffffffffLL * SDL_NS_PER_MS;
const Uint64 max_delay = 0xffffffffLL * SDL_NS_PER_MS; if (ns > max_delay) {
if (ns > max_delay) { ns = max_delay;
ns = max_delay;
}
#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER <= 180030723)
static HANDLE mutex = 0;
if (!mutex) {
mutex = CreateEventEx(0, 0, 0, EVENT_ALL_ACCESS);
}
WaitForSingleObjectEx(mutex, (DWORD)SDL_NS_TO_MS(ns), FALSE);
#else
Sleep((DWORD)SDL_NS_TO_MS(ns));
#endif
} }
const DWORD delay = (DWORD)SDL_NS_TO_MS(ns);
HANDLE event = SDL_GetWaitableEvent();
if (event) {
WaitForSingleObjectEx(event, delay, FALSE);
return;
}
Sleep(delay);
} }
#endif // SDL_TIMER_WINDOWS #endif // SDL_TIMER_WINDOWS