incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make zone allocation thread-safe

Browse source
This commit is contained in:
Gustaf Alhäll 2025-12-20 14:28:46 +01:00 committed by NepDisk
parent 4b7bbf622b
commit 32af5957ca
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/z_zone.cpp
View file

@ -39,6 +39,8 @@
#include "i_video.h" // rendermode
#include "z_zone.h"
#include "lua_script.h"
#include "i_threads.h"
#include "lua_script.h"
#include <tracy/tracy/TracyC.h>
@ -72,6 +74,8 @@ typedef struct memblock_s
#define MEMORY(x) (void *)((uintptr_t)(x) + sizeof(memblock_t) + ALIGNPAD)
#define MEMBLOCK(x) (memblock_t *)((uintptr_t)(x) - ALIGNPAD - sizeof(memblock_t))
static I_mutex alloc_mutex;
// both the head and tail of the zone memory block list
static memblock_t head;
@ -134,6 +138,8 @@ void Z_Free2(void *ptr, const char *file, INT32 line)
if (ptr == NULL)
return;
I_lock_mutex(&alloc_mutex);
/*
// Sal: There's a print exactly like this just below?
#ifdef ZDEBUG
@ -166,6 +172,8 @@ void Z_Free2(void *ptr, const char *file, INT32 line)
#endif
block->prev->next = block->next;
block->next->prev = block->prev;
I_unlock_mutex(alloc_mutex);
free(block);
}
@ -227,6 +235,8 @@ void *Z_Malloc2(size_t size, INT32 tag, void *user, INT32 alignbits,
ptr = MEMORY(block);
I_Assert((intptr_t)ptr % alignof (max_align_t) == 0);
I_lock_mutex(&alloc_mutex);
block->next = head.next;
block->prev = &head;
head.next = block;
@ -246,6 +256,8 @@ void *Z_Malloc2(size_t size, INT32 tag, void *user, INT32 alignbits,
block->id = ZONEID;
I_unlock_mutex(alloc_mutex);
if (user != NULL)
{
block->user = (void**)user;