qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-25 05:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

[zone] Correct the spelling of sentinel

Browse source
This commit is contained in:
Bill Currie 2023-12-21 02:18:56 +09:00
parent 82428ffb9d
commit 049566062d
1 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libs/util/zone.c
View file

@ -55,7 +55,7 @@ static void Cache_Profile_r (memhunk_t *hunk);
static bool Cache_FreeLRU (memhunk_t *hunk); static bool Cache_FreeLRU (memhunk_t *hunk);
#define ZONEID 0x1d4a11 #define ZONEID 0x1d4a11
#define HUNK_SENTINAL 0x1df001ed #define HUNK_SENTINEL 0x1df001ed
#define MINFRAGMENT 64 #define MINFRAGMENT 64
#define HUNK_ALIGN 64 #define HUNK_ALIGN 64
@ -162,7 +162,7 @@ z_merge_blocks (memzone_t *zone, memblock_t *a, memblock_t *b)
} }
static void static void
z_set_sentinal (memblock_t *block) z_set_sentinel (memblock_t *block)
{ {
*(int *) ((byte *) block + block->block_size - 4) = ZONEID; *(int *) ((byte *) block + block->block_size - 4) = ZONEID;
} }
@ -361,7 +361,7 @@ Z_TagMalloc (memzone_t *zone, size_t size, int tag)
zone->used += base->block_size; zone->used += base->block_size;
// marker for memory trash testing // marker for memory trash testing
z_set_sentinal (base); z_set_sentinel (base);
if (developer & SYS_zone) { if (developer & SYS_zone) {
Z_CheckHeap (zone); Z_CheckHeap (zone);
@ -402,14 +402,14 @@ Z_Realloc (memzone_t *zone, void *ptr, size_t size)
} }
} }
block->size = size; block->size = size;
z_set_sentinal (block); z_set_sentinel (block);
} else { } else {
auto other = block->next; auto other = block->next;
if (!other->tag && block->block_size + other->block_size >= new_size) { if (!other->tag && block->block_size + other->block_size >= new_size) {
z_split_block (other, new_size - block->block_size); z_split_block (other, new_size - block->block_size);
z_merge_blocks (zone, block, other); z_merge_blocks (zone, block, other);
block->size = size; block->size = size;
z_set_sentinal (block); z_set_sentinel (block);
} else { } else {
ptr = Z_TagMalloc (zone, size, 1); ptr = Z_TagMalloc (zone, size, 1);
} }
@ -593,8 +593,8 @@ struct cache_system_s {
} __attribute__((aligned (64))); } __attribute__((aligned (64)));
typedef struct { typedef struct {
int sentinal1; int sentinel1;
int sentinal2; int sentinel2;
size_t size; // including sizeof(hunkblk_t), -1 = not allocated size_t size; // including sizeof(hunkblk_t), -1 = not allocated
char name[16]; char name[16];
} __attribute__((aligned (64))) hunkblk_t; } __attribute__((aligned (64))) hunkblk_t;
@ -627,7 +627,7 @@ static int
hunk_check (memhunk_t *hunk, hunkblk_t *h, int err) hunk_check (memhunk_t *hunk, hunkblk_t *h, int err)
{ {
const char *msg = 0; const char *msg = 0;
if (h->sentinal1 != HUNK_SENTINAL || h->sentinal2 != HUNK_SENTINAL) { if (h->sentinel1 != HUNK_SENTINEL || h->sentinel2 != HUNK_SENTINEL) {
msg = "Hunk_Check: trashed sentinel"; msg = "Hunk_Check: trashed sentinel";
} }
if (!msg && (h->size < sizeof (hunkblk_t) if (!msg && (h->size < sizeof (hunkblk_t)
@ -671,7 +671,7 @@ hunk_check (memhunk_t *hunk, hunkblk_t *h, int err)
/* /*
Hunk_Check Hunk_Check
Run consistancy and sentinal trahing checks Run consistancy and sentinel trahing checks
*/ */
VISIBLE void VISIBLE void
Hunk_Check (memhunk_t *hunk) Hunk_Check (memhunk_t *hunk)
@ -820,8 +820,8 @@ Hunk_RawAlloc (memhunk_t *hunk, size_t size)
Cache_FreeLow (hunk, hunk->low_used); Cache_FreeLow (hunk, hunk->low_used);
h->size = size; h->size = size;
h->sentinal1 = HUNK_SENTINAL; h->sentinel1 = HUNK_SENTINEL;
h->sentinal2 = HUNK_SENTINAL; h->sentinel2 = HUNK_SENTINEL;
h->name[0] = 0; h->name[0] = 0;
return (void *) (h + 1); return (void *) (h + 1);
@ -907,8 +907,8 @@ Hunk_HighAlloc (memhunk_t *hunk, size_t size)
Cache_FreeHigh (hunk, hunk->high_used); Cache_FreeHigh (hunk, hunk->high_used);
h = (void *) (hunk->base + hunk->size - hunk->high_used); h = (void *) (hunk->base + hunk->size - hunk->high_used);
h->sentinal1 = HUNK_SENTINAL; h->sentinel1 = HUNK_SENTINEL;
h->sentinal2 = HUNK_SENTINAL; h->sentinel2 = HUNK_SENTINEL;
h->size = size; h->size = size;
h->name[0] = 0; h->name[0] = 0;
return h + 1; return h + 1;