mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-16 08:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated the atomic API for SDL 3.0 naming conventions

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/7388
This commit is contained in:
Sam Lantinga
2024-01-18 03:39:55 -08:00
parent 4e60fc9b2b
commit a2665f54c8
24 changed files with 156 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/timer/SDL_timer.c
View File

@@ -112,7 +112,7 @@ static int SDLCALL SDL_TimerThread(void *_data)
*/
for (;;) {
/* Pending and freelist maintenance */
SDL_AtomicLock(&data->lock);
SDL_LockSpinlock(&data->lock);
{
/* Get any timers ready to be queued */
pending = data->pending;
@@ -124,7 +124,7 @@ static int SDLCALL SDL_TimerThread(void *_data)
data->freelist = freelist_head;
}
}
SDL_AtomicUnlock(&data->lock);
SDL_UnlockSpinlock(&data->lock);
/* Sort the pending timers into our list */
while (pending) {
@@ -239,7 +239,7 @@ void SDL_QuitTimers(void)
SDL_Timer *timer;
SDL_TimerMap *entry;
if (SDL_AtomicCAS(&data->active, 1, 0)) { /* active? Move to inactive. */
if (SDL_AtomicCompareAndSwap(&data->active, 1, 0)) { /* active? Move to inactive. */
/* Shutdown the timer thread */
if (data->thread) {
SDL_PostSemaphore(data->sem);
@@ -278,10 +278,10 @@ SDL_TimerID SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *para
SDL_Timer *timer;
SDL_TimerMap *entry;
SDL_AtomicLock(&data->lock);
SDL_LockSpinlock(&data->lock);
if (!SDL_AtomicGet(&data->active)) {
if (SDL_InitTimers() < 0) {
SDL_AtomicUnlock(&data->lock);
SDL_UnlockSpinlock(&data->lock);
return 0;
}
}
@@ -290,7 +290,7 @@ SDL_TimerID SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *para
if (timer) {
data->freelist = timer->next;
}
SDL_AtomicUnlock(&data->lock);
SDL_UnlockSpinlock(&data->lock);
if (timer) {
SDL_RemoveTimer(timer->timerID);
@@ -321,10 +321,10 @@ SDL_TimerID SDL_AddTimer(Uint32 interval, SDL_TimerCallback callback, void *para
SDL_UnlockMutex(data->timermap_lock);
/* Add the timer to the pending list for the timer thread */
SDL_AtomicLock(&data->lock);
SDL_LockSpinlock(&data->lock);
timer->next = data->pending;
data->pending = timer;
SDL_AtomicUnlock(&data->lock);
SDL_UnlockSpinlock(&data->lock);
/* Wake up the timer thread if necessary */
SDL_PostSemaphore(data->sem);