mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2026-02-18 09:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow passing a pointer to SDL_FreeEventMemory()

Browse Source 
Also clarify in the documentation that you should not call SDL_FreeEventMemory(NULL) from your main thread.
This commit is contained in:
Sam Lantinga
2024-07-18 10:32:13 -07:00
parent 217330a7b3
commit 2816745f48
4 changed files with 54 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/dynapi/SDL_dynapi_procs.h
View File

@@ -169,7 +169,7 @@ SDL_DYNAPI_PROC(int,SDL_FlushAudioStream,(SDL_AudioStream *a),(a),return)
SDL_DYNAPI_PROC(void,SDL_FlushEvent,(Uint32 a),(a),)
SDL_DYNAPI_PROC(void,SDL_FlushEvents,(Uint32 a, Uint32 b),(a,b),)
SDL_DYNAPI_PROC(int,SDL_FlushRenderer,(SDL_Renderer *a),(a),return)
SDL_DYNAPI_PROC(void,SDL_FreeEventMemory,(void),(),)
SDL_DYNAPI_PROC(void,SDL_FreeEventMemory,(const void *a),(a),)
SDL_DYNAPI_PROC(void,SDL_GDKSuspendComplete,(void),(),)
SDL_DYNAPI_PROC(SDL_GLContext,SDL_GL_CreateContext,(SDL_Window *a),(a),return)
SDL_DYNAPI_PROC(int,SDL_GL_DestroyContext,(SDL_GLContext a),(a),return)

50
src/events/SDL_events.c
View File

@@ -110,12 +110,7 @@ static void SDL_CleanupEventMemory(void *data)
{
SDL_EventMemoryState *state = (SDL_EventMemoryState *)data;
while (state->head) {
SDL_EventMemory *entry = state->head;
state->head = entry->next;
SDL_free(entry->memory);
SDL_free(entry);
}
SDL_FreeEventMemory(NULL);
SDL_free(state);
}
@@ -217,9 +212,46 @@ static void SDL_FlushEventMemory(Uint32 eventID)
}
}
void SDL_FreeEventMemory(void)
void SDL_FreeEventMemory(const void *mem)
{
SDL_FlushEventMemory(0);
SDL_EventMemoryState *state;
state = SDL_GetEventMemoryState(SDL_FALSE);
if (!state) {
return;
}
if (mem) {
SDL_EventMemory *prev = NULL, *entry;
for (entry = state->head; entry; prev = entry, entry = entry->next) {
if (mem == entry->memory) {
if (prev) {
prev->next = entry->next;
}
if (entry == state->head) {
state->head = entry->next;
}
if (entry == state->tail) {
state->tail = prev;
}
SDL_free(entry->memory);
SDL_free(entry);
break;
}
}
} else {
if (state->head) {
while (state->head) {
SDL_EventMemory *entry = state->head;
state->head = entry->next;
SDL_free(entry->memory);
SDL_free(entry);
}
state->tail = NULL;
}
}
}
#ifndef SDL_JOYSTICK_DISABLED
@@ -741,7 +773,7 @@ void SDL_StopEventLoop(void)
SDL_EventQ.free = NULL;
SDL_AtomicSet(&SDL_sentinel_pending, 0);
SDL_FlushEventMemory(0);
SDL_FreeEventMemory(NULL);
/* Clear disabled event state */
for (i = 0; i < SDL_arraysize(SDL_disabled_events); ++i) {