From: havoc Date: Wed, 11 Sep 2002 00:15:23 +0000 (+0000) Subject: memheaders are now doubly linked, so Mem_Free goes faster than it used to X-Git-Tag: RELEASE_0_2_0_RC1~253 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99dc7490c17b02fd914d2a0c021753a42acde35d;p=xonotic%2Fdarkplaces.git memheaders are now doubly linked, so Mem_Free goes faster than it used to git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@2353 d7cf8633-e32d-0410-b094-e92efae38249 --- diff --git a/zone.c b/zone.c index db9952ff..b0decee9 100644 --- a/zone.c +++ b/zone.c @@ -110,8 +110,11 @@ choseclump: // we have to use only a single byte for this sentinel, because it may not be aligned, and some platforms can't use unaligned accesses *((qbyte *) mem + sizeof(memheader_t) + mem->size) = MEMHEADER_SENTINEL2; // append to head of list - mem->chain = pool->chain; + mem->next = pool->chain; + mem->prev = NULL; pool->chain = mem; + if (mem->next) + mem->next->prev = mem; memset((void *)((qbyte *) mem + sizeof(memheader_t)), 0, mem->size); return (void *)((qbyte *) mem + sizeof(memheader_t)); } @@ -122,12 +125,11 @@ void _Mem_Free(void *data, char *filename, int fileline) int i, firstblock, endblock; memclump_t *clump, **clumpchainpointer; #endif - memheader_t *mem, **memchainpointer; + memheader_t *mem; mempool_t *pool; if (data == NULL) Sys_Error("Mem_Free: data == NULL (called at %s:%i)", filename, fileline); - mem = (memheader_t *)((qbyte *) data - sizeof(memheader_t)); if (mem->sentinel1 != MEMHEADER_SENTINEL1) Sys_Error("Mem_Free: trashed header sentinel 1 (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline); @@ -135,63 +137,64 @@ void _Mem_Free(void *data, char *filename, int fileline) Sys_Error("Mem_Free: trashed header sentinel 2 (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline); pool = mem->pool; Con_DPrintf("Mem_Free: pool %s, alloc %s:%i, free %s:%i, size %i bytes\n", pool->name, mem->filename, mem->fileline, filename, fileline, mem->size); - for (memchainpointer = &pool->chain;*memchainpointer;memchainpointer = &(*memchainpointer)->chain) + // unlink memheader from doubly linked list + if ((mem->prev ? mem->prev->next != mem : pool->chain != mem) || (mem->next && mem->next->prev != mem)) + Sys_Error("Mem_Free: not allocated or double freed (free at %s:%i)", filename, fileline); + if (mem->prev) + mem->prev->next = mem->next; + else + pool->chain = mem->next; + if (mem->next) + mem->next->prev = mem->prev; + // memheader has been unlinked, do the actual free now + pool->totalsize -= mem->size; +#if MEMCLUMPING + if ((clump = mem->clump)) { - if (*memchainpointer == mem) + if (clump->sentinel1 != MEMCLUMP_SENTINEL) + Sys_Error("Mem_Free: trashed clump sentinel 1 (free at %s:%i)", filename, fileline); + if (clump->sentinel2 != MEMCLUMP_SENTINEL) + Sys_Error("Mem_Free: trashed clump sentinel 2 (free at %s:%i)", filename, fileline); + firstblock = ((qbyte *) mem - (qbyte *) clump->block); + if (firstblock & (MEMUNIT - 1)) + Sys_Error("Mem_Free: address not valid in clump (free at %s:%i)", filename, fileline); + firstblock /= MEMUNIT; + endblock = firstblock + ((sizeof(memheader_t) + mem->size + sizeof(int) + (MEMUNIT - 1)) / MEMUNIT); + clump->blocksinuse -= endblock - firstblock; + // could use &, but we know the bit is set + for (i = firstblock;i < endblock;i++) + clump->bits[i >> 5] -= (1 << (i & 31)); + if (clump->blocksinuse <= 0) { - *memchainpointer = mem->chain; - pool->totalsize -= mem->size; -#if MEMCLUMPING - if ((clump = mem->clump)) + // unlink from chain + for (clumpchainpointer = &pool->clumpchain;*clumpchainpointer;clumpchainpointer = &(*clumpchainpointer)->chain) { - if (clump->sentinel1 != MEMCLUMP_SENTINEL) - Sys_Error("Mem_Free: trashed clump sentinel 1 (free at %s:%i)", filename, fileline); - if (clump->sentinel2 != MEMCLUMP_SENTINEL) - Sys_Error("Mem_Free: trashed clump sentinel 2 (free at %s:%i)", filename, fileline); - firstblock = ((qbyte *) mem - (qbyte *) clump->block); - if (firstblock & (MEMUNIT - 1)) - Sys_Error("Mem_Free: address not valid in clump (free at %s:%i)", filename, fileline); - firstblock /= MEMUNIT; - endblock = firstblock + ((sizeof(memheader_t) + mem->size + sizeof(int) + (MEMUNIT - 1)) / MEMUNIT); - clump->blocksinuse -= endblock - firstblock; - // could use &, but we know the bit is set - for (i = firstblock;i < endblock;i++) - clump->bits[i >> 5] -= (1 << (i & 31)); - if (clump->blocksinuse <= 0) + if (*clumpchainpointer == clump) { - // unlink from chain - for (clumpchainpointer = &pool->clumpchain;*clumpchainpointer;clumpchainpointer = &(*clumpchainpointer)->chain) - { - if (*clumpchainpointer == clump) - { - *clumpchainpointer = clump->chain; - break; - } - } - pool->realsize -= sizeof(memclump_t); - memset(clump, 0xBF, sizeof(memclump_t)); - free(clump); - } - else - { - // clump still has some allocations - // force re-check of largest available space on next alloc - clump->largestavailable = MEMBITS - clump->blocksinuse; + *clumpchainpointer = clump->chain; + break; } } - else - { + pool->realsize -= sizeof(memclump_t); + memset(clump, 0xBF, sizeof(memclump_t)); + free(clump); + } + else + { + // clump still has some allocations + // force re-check of largest available space on next alloc + clump->largestavailable = MEMBITS - clump->blocksinuse; + } + } + else + { #endif - pool->realsize -= sizeof(memheader_t) + mem->size + sizeof(int); - memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int)); - free(mem); + pool->realsize -= sizeof(memheader_t) + mem->size + sizeof(int); + memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int)); + free(mem); #if MEMCLUMPING - } -#endif - return; - } } - Sys_Error("Mem_Free: not allocated (free at %s:%i)", filename, fileline); +#endif } mempool_t *_Mem_AllocPool(char *name, char *filename, int fileline) @@ -294,7 +297,7 @@ void _Mem_CheckSentinelsGlobal(char *filename, int fileline) Sys_Error("Mem_CheckSentinelsGlobal: trashed pool sentinel 2 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, fileline); } for (pool = poolchain;pool;pool = pool->next) - for (mem = pool->chain;mem;mem = mem->chain) + for (mem = pool->chain;mem;mem = mem->next) _Mem_CheckSentinels((void *)((qbyte *) mem + sizeof(memheader_t)), filename, fileline); #if MEMCLUMPING for (pool = poolchain;pool;pool = pool->next) @@ -328,7 +331,7 @@ void Mem_PrintStats(void) { Con_Printf("%i bytes (%.3fMB) of temporary memory still allocated (Leak!)\n", tempmempool->totalsize, tempmempool->totalsize / 1048576.0); Con_Printf("listing temporary memory allocations:\n"); - for (mem = tempmempool->chain;mem;mem = mem->chain) + for (mem = tempmempool->chain;mem;mem = mem->next) Con_Printf("%10i bytes allocated at %s:%i\n", mem->size, mem->filename, mem->fileline); } } @@ -348,7 +351,7 @@ void Mem_PrintList(int listallocations) Con_Printf("%6ik (%6ik actual) %s\n", (pool->totalsize + 1023) / 1024, (pool->realsize + 1023) / 1024, pool->name); pool->lastchecksize = pool->totalsize; if (listallocations) - for (mem = pool->chain;mem;mem = mem->chain) + for (mem = pool->chain;mem;mem = mem->next) Con_Printf("%10i bytes allocated at %s:%i\n", mem->size, mem->filename, mem->fileline); } } diff --git a/zone.h b/zone.h index c76867d2..3396707c 100644 --- a/zone.h +++ b/zone.h @@ -40,8 +40,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef struct memheader_s { - // next memheader in chain belonging to pool - struct memheader_s *chain; + // next and previous memheaders in chain belonging to pool + struct memheader_s *next; + struct memheader_s *prev; // pool this memheader belongs to struct mempool_s *pool; #if MEMCLUMPING