mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-04-26 09:14:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename SDL semaphore and condition variable functions to match SDL 3.0 naming convention

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/7642
This commit is contained in:
Sam Lantinga
2023-04-27 20:49:54 -07:00
parent 170c410d35
commit 61c0c009ab
45 changed files with 458 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/testatomic.c
View File

@@ -121,7 +121,7 @@ static int SDLCALL adder(void *junk)
bad -= CountInc;
}
SDL_AtomicAdd(&threadsRunning, -1);
SDL_SemPost(threadDone);
SDL_PostSemaphore(threadDone);
return 0;
}
@@ -141,7 +141,7 @@ static void runAdder(void)
}
while (SDL_AtomicGet(&threadsRunning) > 0) {
SDL_SemWait(threadDone);
SDL_WaitSemaphore(threadDone);
}
SDL_DestroySemaphore(threadDone);

24
test/testsem.c
View File

@@ -52,13 +52,13 @@ ThreadFuncRealWorld(void *data)
{
Thread_State *state = (Thread_State *)data;
while (alive) {
SDL_SemWait(sem);
SDL_WaitSemaphore(sem);
SDL_Log("Thread number %d has got the semaphore (value = %" SDL_PRIu32 ")!\n",
state->number, SDL_SemValue(sem));
state->number, SDL_GetSemaphoreValue(sem));
SDL_Delay(200);
SDL_SemPost(sem);
SDL_PostSemaphore(sem);
SDL_Log("Thread number %d has released the semaphore (value = %" SDL_PRIu32 ")!\n",
state->number, SDL_SemValue(sem));
state->number, SDL_GetSemaphoreValue(sem));
++state->loop_count;
SDL_Delay(1); /* For the scheduler */
}
@@ -114,7 +114,7 @@ TestWaitTimeout(void)
SDL_Log("Waiting 2 seconds on semaphore\n");
start_ticks = SDL_GetTicks();
retval = SDL_SemWaitTimeout(sem, 2000);
retval = SDL_WaitSemaphoreTimeout(sem, 2000);
end_ticks = SDL_GetTicks();
duration = end_ticks - start_ticks;
@@ -125,7 +125,7 @@ TestWaitTimeout(void)
/* Check to make sure the return value indicates timed out */
if (retval != SDL_MUTEX_TIMEDOUT) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_SemWaitTimeout returned: %d; expected: %d\n\n", retval, SDL_MUTEX_TIMEDOUT);
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_WaitSemaphoreTimeout returned: %d; expected: %d\n\n", retval, SDL_MUTEX_TIMEDOUT);
}
SDL_DestroySemaphore(sem);
@@ -145,10 +145,10 @@ TestOverheadUncontended(void)
start_ticks = SDL_GetTicks();
for (i = 0; i < NUM_OVERHEAD_OPS_MULT; i++) {
for (j = 0; j < NUM_OVERHEAD_OPS; j++) {
SDL_SemPost(sem);
SDL_PostSemaphore(sem);
}
for (j = 0; j < NUM_OVERHEAD_OPS; j++) {
SDL_SemWait(sem);
SDL_WaitSemaphore(sem);
}
}
end_ticks = SDL_GetTicks();
@@ -166,7 +166,7 @@ ThreadFuncOverheadContended(void *data)
if (state->flag) {
while (alive) {
if (SDL_SemTryWait(sem) == SDL_MUTEX_TIMEDOUT) {
if (SDL_TryWaitSemaphore(sem) == SDL_MUTEX_TIMEDOUT) {
++state->content_count;
}
++state->loop_count;
@@ -174,7 +174,7 @@ ThreadFuncOverheadContended(void *data)
} else {
while (alive) {
/* Timeout needed to allow check on alive flag */
if (SDL_SemWaitTimeout(sem, 50) == SDL_MUTEX_TIMEDOUT) {
if (SDL_WaitSemaphoreTimeout(sem, 50) == SDL_MUTEX_TIMEDOUT) {
++state->content_count;
}
++state->loop_count;
@@ -211,10 +211,10 @@ TestOverheadContended(SDL_bool try_wait)
start_ticks = SDL_GetTicks();
for (i = 0; i < NUM_OVERHEAD_OPS_MULT; i++) {
for (j = 0; j < NUM_OVERHEAD_OPS; j++) {
SDL_SemPost(sem);
SDL_PostSemaphore(sem);
}
/* Make sure threads consumed everything */
while (SDL_SemValue(sem)) {
while (SDL_GetSemaphoreValue(sem)) {
/* Friendlier with cooperative threading models */
SDL_DelayNS(1);
}