qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

resurrect Z_Print. 

This is an imperfect revision of history.
This commit is contained in:
Bill Currie 2004-11-14 00:49:00 +00:00 committed by Jeff Teunissen
parent 554f4d071a
commit 2488465bc9
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/QF/zone.h
View File

@ -102,6 +102,7 @@ void Z_Free (memzone_t *zone, void *ptr);
void *Z_Malloc (memzone_t *zone, int size); // returns 0 filled memory void *Z_Malloc (memzone_t *zone, int size); // returns 0 filled memory
void *Z_TagMalloc (memzone_t *zone, int size, int tag); void *Z_TagMalloc (memzone_t *zone, int size, int tag);
void *Z_Realloc (memzone_t *zone, void *ptr, int size); void *Z_Realloc (memzone_t *zone, void *ptr, int size);
void Z_Print (memzone_t *zone);
void Z_CheckHeap (memzone_t *zone); void Z_CheckHeap (memzone_t *zone);
void *Hunk_Alloc (int size); // returns 0 filled memory void *Hunk_Alloc (int size); // returns 0 filled memory

31
libs/util/zone.c
View File

@ -92,9 +92,9 @@ typedef struct memblock_s
struct memzone_s struct memzone_s
{ {
int size; // total bytes malloced, including header int size; // total bytes malloced, including header
int used; // ammount used, including header
memblock_t blocklist; // start / end cap for linked list memblock_t blocklist; // start / end cap for linked list
memblock_t *rover; memblock_t *rover;
int pad; // pad to 64 bit boundary
}; };
@ -105,12 +105,15 @@ Z_ClearZone (memzone_t *zone, int size)
// set the entire zone to one free block // set the entire zone to one free block
zone->blocklist.next = zone->blocklist.prev = block = block = (memblock_t *) (zone + 1);
(memblock_t *) ((byte *) zone + sizeof (memzone_t)); zone->blocklist.next = block;
zone->blocklist.prev = block;
zone->blocklist.tag = 1; // in use block zone->blocklist.tag = 1; // in use block
zone->blocklist.id = 0; zone->blocklist.id = 0;
zone->blocklist.size = 0; zone->blocklist.size = 0;
zone->rover = block; zone->rover = block;
zone->size = size;
zone->used = sizeof (memzone_t);
block->prev = block->next = &zone->blocklist; block->prev = block->next = &zone->blocklist;
block->tag = 0; // free block block->tag = 0; // free block
@ -133,6 +136,7 @@ Z_Free (memzone_t *zone, void *ptr)
Sys_Error ("Z_Free: freed a freed pointer"); Sys_Error ("Z_Free: freed a freed pointer");
block->tag = 0; // mark as free block->tag = 0; // mark as free
zone->used -= block->size;
other = block->prev; other = block->prev;
if (!other->tag) { if (!other->tag) {
@ -219,10 +223,12 @@ Z_TagMalloc (memzone_t *zone, int size, int tag)
base->id = ZONEID; base->id = ZONEID;
zone->used += base->size;
// marker for memory trash testing // marker for memory trash testing
*(int *) ((byte *) base + base->size - 4) = ZONEID; *(int *) ((byte *) base + base->size - 4) = ZONEID;
return (void *) ((byte *) base + sizeof (memblock_t)); return (void *) (base + 1);
} }
void * void *
@ -254,18 +260,19 @@ Z_Realloc (memzone_t *zone, void *ptr, int size)
return ptr; return ptr;
} }
/*
static void void
Z_Print (memzone_t *zone) Z_Print (memzone_t *zone)
{ {
memblock_t *block; memblock_t *block;
Sys_Printf ("zone size: %i location: %p\n",zone->size,zone); Sys_Printf ("zone size: %i location: %p used: %i\n",
zone->size, zone, zone->used);
for (block = zone->blocklist.next ; ; block = block->next) for (block = zone->blocklist.next ; ; block = block->next)
{ {
Sys_Printf ("block:%p size:%7i tag:%3i\n", Sys_Printf ("block:%p size:%7i tag:%3i ofs:%d\n",
block, block->size, block->tag); block, block->size, block->tag, (byte *) block - (byte *) zone);
if (block->next == &zone->blocklist) if (block->next == &zone->blocklist)
break; // all blocks have been hit break; // all blocks have been hit
@ -275,9 +282,13 @@ Z_Print (memzone_t *zone)
Sys_Printf ("ERROR: next block doesn't have proper back link\n"); Sys_Printf ("ERROR: next block doesn't have proper back link\n");
if (!block->tag && !block->next->tag) if (!block->tag && !block->next->tag)
Sys_Printf ("ERROR: two consecutive free blocks\n"); Sys_Printf ("ERROR: two consecutive free blocks\n");
if (block->tag
&& (*(int *) ((byte *) block + block->size - 4) != ZONEID))
Sys_Printf ("ERROR: memory trashed in block\n");
fflush (stdout);
} }
} }
*/
void void
Z_CheckHeap (memzone_t *zone) Z_CheckHeap (memzone_t *zone)
{ {