gitea/SDL3_fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Disable tracking memory allocation counts by default

Browse Source 
Fixes https://github.com/libsdl-org/SDL/issues/11099
This commit is contained in:
Sam Lantinga
2024-12-21 05:34:12 -08:00
parent 80c1b1e1a0
commit 2e4dc9c109
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/stdlib/SDL_malloc.c
View File

@@ -6352,6 +6352,17 @@ static struct
real_malloc, real_calloc, real_realloc, real_free, { 0 } real_malloc, real_calloc, real_realloc, real_free, { 0 }
}; };
// Define this if you want to track the number of allocations active
// #define TRACK_ALLOCATION_COUNT
#ifdef TRACK_ALLOCATION_COUNT
#define INCREMENT_ALLOCATION_COUNT() (void)SDL_AtomicIncRef(&s_mem.num_allocations)
#define DECREMENT_ALLOCATION_COUNT() (void)SDL_AtomicDecRef(&s_mem.num_allocations)
#else
#define INCREMENT_ALLOCATION_COUNT()
#define DECREMENT_ALLOCATION_COUNT()
#endif
void SDL_GetOriginalMemoryFunctions(SDL_malloc_func *malloc_func, void SDL_GetOriginalMemoryFunctions(SDL_malloc_func *malloc_func,
SDL_calloc_func *calloc_func, SDL_calloc_func *calloc_func,
SDL_realloc_func *realloc_func, SDL_realloc_func *realloc_func,
@@ -6430,7 +6441,7 @@ void *SDL_malloc(size_t size)
mem = s_mem.malloc_func(size); mem = s_mem.malloc_func(size);
if (mem) { if (mem) {
SDL_AtomicIncRef(&s_mem.num_allocations); INCREMENT_ALLOCATION_COUNT();
} else { } else {
SDL_OutOfMemory(); SDL_OutOfMemory();
} }
@@ -6449,7 +6460,7 @@ void *SDL_calloc(size_t nmemb, size_t size)
mem = s_mem.calloc_func(nmemb, size); mem = s_mem.calloc_func(nmemb, size);
if (mem) { if (mem) {
SDL_AtomicIncRef(&s_mem.num_allocations); INCREMENT_ALLOCATION_COUNT();
} else { } else {
SDL_OutOfMemory(); SDL_OutOfMemory();
} }
@@ -6467,7 +6478,7 @@ void *SDL_realloc(void *ptr, size_t size)
mem = s_mem.realloc_func(ptr, size); mem = s_mem.realloc_func(ptr, size);
if (mem && !ptr) { if (mem && !ptr) {
SDL_AtomicIncRef(&s_mem.num_allocations); INCREMENT_ALLOCATION_COUNT();
} else if (!mem) { } else if (!mem) {
SDL_OutOfMemory(); SDL_OutOfMemory();
} }
@@ -6482,5 +6493,5 @@ void SDL_free(void *ptr)
} }
s_mem.free_func(ptr); s_mem.free_func(ptr);
(void)SDL_AtomicDecRef(&s_mem.num_allocations); DECREMENT_ALLOCATION_COUNT();
} }