eden-emu/SDL
19
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed temporary memory from the API

Browse source 
It was intended to make the API easier to use, but various automatic garbage collection all had flaws, and making the application periodically clean up temporary memory added cognitive load to using the API, and in many cases was it was difficult to restructure threaded code to handle this.

So, we're largely going back to the original system, where the API returns allocated results and you free them.

In addition, to solve the problems we originally wanted temporary memory for:
* Short strings with a finite count, like device names, get stored in a per-thread string pool.
* Events continue to use temporary memory internally, which is cleaned up on the next event processing cycle.
This commit is contained in:
Sam Lantinga 2024-07-26 18:57:18 -07:00
parent 21411c6418
commit 4f55271571
100 changed files with 737 additions and 853 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/events/SDL_keyboard.c
View file

@ -177,7 +177,7 @@ SDL_bool SDL_HasKeyboard(void)
return (SDL_keyboard_count > 0);
}
const SDL_KeyboardID *SDL_GetKeyboards(int *count)
SDL_KeyboardID *SDL_GetKeyboards(int *count)
{
int i;
SDL_KeyboardID *keyboards;
@ -198,7 +198,7 @@ const SDL_KeyboardID *SDL_GetKeyboards(int *count)
}
}
return SDL_FreeLater(keyboards);
return keyboards;
}
const char *SDL_GetKeyboardNameForID(SDL_KeyboardID instance_id)
@ -207,7 +207,7 @@ const char *SDL_GetKeyboardNameForID(SDL_KeyboardID instance_id)
if (keyboard_index < 0) {
return NULL;
}
return SDL_CreateTemporaryString(SDL_keyboards[keyboard_index].name);
return SDL_GetPersistentString(SDL_keyboards[keyboard_index].name);
}
void SDL_ResetKeyboard(void)
@ -762,7 +762,7 @@ int SDL_SendEditingText(const char *text, int start, int length)
static const char * const *CreateCandidatesForEvent(char **candidates, int num_candidates)
{
char **event_candidates;
const char **event_candidates;
int i;
char *ptr;
size_t total_length = (num_candidates + 1) * sizeof(*event_candidates);
@ -773,7 +773,7 @@ static const char * const *CreateCandidatesForEvent(char **candidates, int num_c
total_length += length;
}
event_candidates = (char **)SDL_malloc(total_length);
event_candidates = (const char **)SDL_AllocateTemporaryMemory(total_length);
if (!event_candidates) {
return NULL;
}
@ -788,7 +788,7 @@ static const char * const *CreateCandidatesForEvent(char **candidates, int num_c
}
event_candidates[i] = NULL;
return SDL_FreeLater(event_candidates);
return event_candidates;
}
int SDL_SendEditingTextCandidates(char **candidates, int num_candidates, int selected_candidate, SDL_bool horizontal)