X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=zone.c;h=688a958e194934ec24e1d96b8416a4c9ee0e3359;hb=2f311cc6db562c4a78e216f914fdbeab4227aa69;hp=3cbde6c9f64e7d68d738c1aa2eabd56e45473307;hpb=c8a3bdab66e27480bb4676d997c0be09a33f7ade;p=xonotic%2Fdarkplaces.git diff --git a/zone.c b/zone.c index 3cbde6c9..688a958e 100644 --- a/zone.c +++ b/zone.c @@ -21,6 +21,23 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" +#if MEMPARANOIA +#ifdef _MSC_VER +#include +#else +#include +#endif +#define MEMHEADER_SENTINEL_FOR_ADDRESS(p) ((sentinel_seed ^ (unsigned int) (uintptr_t) (p)) + sentinel_seed) +unsigned int sentinel_seed; +#else +#define MEMHEADER_SENTINEL1 0xDEADF00D +#define MEMHEADER_SENTINEL2 0xDF +#endif + +#if MEMCLUMPING +#define MEMCLUMP_SENTINEL 0xABADCAFE +#endif + cvar_t developer_memory = {0, "developer_memory", "0", "prints debugging information about memory allocations"}; cvar_t developer_memorydebug = {0, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"}; @@ -31,6 +48,9 @@ void *_Mem_Alloc(mempool_t *pool, size_t size, const char *filename, int filelin #if MEMCLUMPING int i, j, k, needed, endbit, largest; memclump_t *clump, **clumpchainpointer; +#endif +#if MEMPARANOIA + unsigned int sentinel2; #endif memheader_t *mem; if (size <= 0) @@ -46,7 +66,11 @@ void *_Mem_Alloc(mempool_t *pool, size_t size, const char *filename, int filelin if (size < 4096) { // clumping - needed = (sizeof(memheader_t) + size + sizeof(int) + (MEMUNIT - 1)) / MEMUNIT; +#if MEMPARANOIA + needed = (sizeof(memheader_t) + size + sizeof(unsigned int) + (MEMUNIT - 1)) / MEMUNIT; +#else + needed = (sizeof(memheader_t) + size + sizeof(unsigned char) + (MEMUNIT - 1)) / MEMUNIT; +#endif endbit = MEMBITS - needed; for (clumpchainpointer = &pool->clumpchain;*clumpchainpointer;clumpchainpointer = &(*clumpchainpointer)->chain) { @@ -100,8 +124,13 @@ choseclump: { // big allocations are not clumped #endif - pool->realsize += sizeof(memheader_t) + size + sizeof(int); - mem = (memheader_t *)malloc(sizeof(memheader_t) + size + sizeof(int)); +#if MEMPARANOIA + pool->realsize += sizeof(memheader_t) + size + sizeof(sentinel2); + mem = (memheader_t *)malloc(sizeof(memheader_t) + size + sizeof(sentinel2)); +#else + pool->realsize += sizeof(memheader_t) + size + 1; + mem = (memheader_t *)malloc(sizeof(memheader_t) + size + 1); +#endif if (mem == NULL) Sys_Error("Mem_Alloc: out of memory (alloc at %s:%i)", filename, fileline); #if MEMCLUMPING @@ -112,9 +141,15 @@ choseclump: mem->fileline = fileline; mem->size = size; mem->pool = pool; +#if MEMPARANOIA + mem->sentinel1 = MEMHEADER_SENTINEL_FOR_ADDRESS(&mem->sentinel1); + sentinel2 = MEMHEADER_SENTINEL_FOR_ADDRESS((unsigned char *) mem + sizeof(memheader_t) + mem->size); + memcpy((unsigned char *) mem + sizeof(memheader_t) + mem->size, &sentinel2, sizeof(sentinel2)); +#else mem->sentinel1 = MEMHEADER_SENTINEL1; // 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 *((unsigned char *) mem + sizeof(memheader_t) + mem->size) = MEMHEADER_SENTINEL2; +#endif // append to head of list mem->next = pool->chain; mem->prev = NULL; @@ -133,10 +168,19 @@ static void _Mem_FreeBlock(memheader_t *mem, const char *filename, int fileline) memclump_t *clump, **clumpchainpointer; #endif mempool_t *pool; +#if MEMPARANOIA + unsigned int sentinel2; + if (mem->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&mem->sentinel1)) + Sys_Error("Mem_Free: trashed header sentinel 1 (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline); + sentinel2 = MEMHEADER_SENTINEL_FOR_ADDRESS((unsigned char *) mem + sizeof(memheader_t) + mem->size); + if (memcmp((unsigned char *) mem + sizeof(memheader_t) + mem->size, &sentinel2, sizeof(sentinel2))) + Sys_Error("Mem_Free: trashed header sentinel 2 (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline); +#else 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); if (*((unsigned char *) mem + sizeof(memheader_t) + mem->size) != MEMHEADER_SENTINEL2) Sys_Error("Mem_Free: trashed header sentinel 2 (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline); +#endif pool = mem->pool; if (developer.integer && developer_memory.integer) Con_Printf("Mem_Free: pool %s, alloc %s:%i, free %s:%i, size %i bytes\n", pool->name, mem->filename, mem->fileline, filename, fileline, (int)(mem->size)); @@ -204,7 +248,10 @@ static void _Mem_FreeBlock(memheader_t *mem, const char *filename, int fileline) void _Mem_Free(void *data, const char *filename, int fileline) { if (data == NULL) - Sys_Error("Mem_Free: data == NULL (called at %s:%i)", filename, fileline); + { + Con_DPrintf("Mem_Free: data == NULL (called at %s:%i)\n", filename, fileline); + return; + } if (developer.integer && developer_memorydebug.integer) { @@ -225,8 +272,13 @@ mempool_t *_Mem_AllocPool(const char *name, int flags, mempool_t *parent, const if (pool == NULL) Sys_Error("Mem_AllocPool: out of memory (allocpool at %s:%i)", filename, fileline); memset(pool, 0, sizeof(mempool_t)); +#if MEMPARANOIA + pool->sentinel1 = MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel1); + pool->sentinel2 = MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel2); +#else pool->sentinel1 = MEMHEADER_SENTINEL1; pool->sentinel2 = MEMHEADER_SENTINEL1; +#endif pool->filename = filename; pool->fileline = fileline; pool->flags = flags; @@ -253,10 +305,17 @@ void _Mem_FreePool(mempool_t **poolpointer, const char *filename, int fileline) for (chainaddress = &poolchain;*chainaddress && *chainaddress != pool;chainaddress = &((*chainaddress)->next)); if (*chainaddress != pool) Sys_Error("Mem_FreePool: pool already free (freepool at %s:%i)", filename, fileline); +#if MEMPARANOIA + if (pool->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel1)) + Sys_Error("Mem_FreePool: trashed pool sentinel 1 (allocpool at %s:%i, freepool at %s:%i)", pool->filename, pool->fileline, filename, fileline); + if (pool->sentinel2 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel2)) + Sys_Error("Mem_FreePool: trashed pool sentinel 2 (allocpool at %s:%i, freepool at %s:%i)", pool->filename, pool->fileline, filename, fileline); +#else if (pool->sentinel1 != MEMHEADER_SENTINEL1) Sys_Error("Mem_FreePool: trashed pool sentinel 1 (allocpool at %s:%i, freepool at %s:%i)", pool->filename, pool->fileline, filename, fileline); if (pool->sentinel2 != MEMHEADER_SENTINEL1) Sys_Error("Mem_FreePool: trashed pool sentinel 2 (allocpool at %s:%i, freepool at %s:%i)", pool->filename, pool->fileline, filename, fileline); +#endif *chainaddress = pool->next; // free memory owned by the pool @@ -292,10 +351,17 @@ void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline) } if (pool == NULL) Sys_Error("Mem_EmptyPool: pool == NULL (emptypool at %s:%i)", filename, fileline); +#if MEMPARANOIA + if (pool->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel1)) + Sys_Error("Mem_EmptyPool: trashed pool sentinel 2 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline); + if (pool->sentinel2 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel2)) + Sys_Error("Mem_EmptyPool: trashed pool sentinel 1 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline); +#else if (pool->sentinel1 != MEMHEADER_SENTINEL1) Sys_Error("Mem_EmptyPool: trashed pool sentinel 1 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline); if (pool->sentinel2 != MEMHEADER_SENTINEL1) Sys_Error("Mem_EmptyPool: trashed pool sentinel 2 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline); +#endif // free memory owned by the pool while (pool->chain) @@ -311,15 +377,26 @@ void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline) void _Mem_CheckSentinels(void *data, const char *filename, int fileline) { memheader_t *mem; +#if MEMPARANOIA + unsigned int sentinel2; +#endif if (data == NULL) Sys_Error("Mem_CheckSentinels: data == NULL (sentinel check at %s:%i)", filename, fileline); mem = (memheader_t *)((unsigned char *) data - sizeof(memheader_t)); +#if MEMPARANOIA + if (mem->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&mem->sentinel1)) + Sys_Error("Mem_Free: trashed header sentinel 1 (alloc at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline); + sentinel2 = MEMHEADER_SENTINEL_FOR_ADDRESS((unsigned char *) mem + sizeof(memheader_t) + mem->size); + if (memcmp((unsigned char *) mem + sizeof(memheader_t) + mem->size, &sentinel2, sizeof(sentinel2))) + Sys_Error("Mem_Free: trashed header sentinel 2 (alloc at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline); +#else if (mem->sentinel1 != MEMHEADER_SENTINEL1) Sys_Error("Mem_CheckSentinels: trashed header sentinel 1 (block allocated at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline); if (*((unsigned char *) mem + sizeof(memheader_t) + mem->size) != MEMHEADER_SENTINEL2) Sys_Error("Mem_CheckSentinels: trashed header sentinel 2 (block allocated at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline); +#endif } #if MEMCLUMPING @@ -342,10 +419,17 @@ void _Mem_CheckSentinelsGlobal(const char *filename, int fileline) mempool_t *pool; for (pool = poolchain;pool;pool = pool->next) { +#if MEMPARANOIA + if (pool->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel1)) + Sys_Error("Mem_CheckSentinelsGlobal: trashed pool sentinel 1 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, fileline); + if (pool->sentinel2 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel2)) + Sys_Error("Mem_CheckSentinelsGlobal: trashed pool sentinel 2 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, fileline); +#else if (pool->sentinel1 != MEMHEADER_SENTINEL1) Sys_Error("Mem_CheckSentinelsGlobal: trashed pool sentinel 1 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, fileline); if (pool->sentinel2 != MEMHEADER_SENTINEL1) Sys_Error("Mem_CheckSentinelsGlobal: trashed pool sentinel 2 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, fileline); +#endif } for (pool = poolchain;pool;pool = pool->next) for (mem = pool->chain;mem;mem = mem->next) @@ -393,7 +477,7 @@ void Mem_ExpandableArray_FreeArray(memexpandablearray_t *l) size_t i; if (l->maxarrays) { - for (i = 0;i != l->numarrays;l++) + for (i = 0;i != l->numarrays;i++) Mem_Free(l->arrays[i].data); Mem_Free(l->arrays); } @@ -411,7 +495,7 @@ void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l) { memexpandablearray_array_t *oldarrays = l->arrays; l->maxarrays = max(l->maxarrays * 2, 128); - l->arrays = Mem_Alloc(l->mempool, l->maxarrays * sizeof(*l->arrays)); + l->arrays = (memexpandablearray_array_t*) Mem_Alloc(l->mempool, l->maxarrays * sizeof(*l->arrays)); if (oldarrays) { memcpy(l->arrays, oldarrays, l->numarrays * sizeof(*l->arrays)); @@ -419,7 +503,7 @@ void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l) } } l->arrays[i].numflaggedrecords = 0; - l->arrays[i].data = Mem_Alloc(l->mempool, (l->recordsize + 1) * l->numrecordsperarray); + l->arrays[i].data = (unsigned char *) Mem_Alloc(l->mempool, (l->recordsize + 1) * l->numrecordsperarray); l->arrays[i].allocflags = l->arrays[i].data + l->recordsize * l->numrecordsperarray; l->numarrays++; } @@ -431,6 +515,7 @@ void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l) { l->arrays[i].allocflags[j] = true; l->arrays[i].numflaggedrecords++; + memset(l->arrays[i].data + l->recordsize * j, 0, l->recordsize); return (void *)(l->arrays[i].data + l->recordsize * j); } } @@ -438,7 +523,16 @@ void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l) } } -void Mem_ExpandableArray_FreeRecord(memexpandablearray_t *l, void *record) +/***************************************************************************** + * IF YOU EDIT THIS: + * If this function was to change the size of the "expandable" array, you have + * to update r_shadow.c + * Just do a search for "range =", R_ShadowClearWorldLights would be the first + * function to look at. (And also seems like the only one?) You might have to + * move the call to Mem_ExpandableArray_IndexRange back into for(...) loop's + * condition + */ +void Mem_ExpandableArray_FreeRecord(memexpandablearray_t *l, void *record) // const! { size_t i, j; unsigned char *p = (unsigned char *)record; @@ -458,26 +552,31 @@ void Mem_ExpandableArray_FreeRecord(memexpandablearray_t *l, void *record) } } -size_t Mem_ExpandableArray_IndexRange(memexpandablearray_t *l) +size_t Mem_ExpandableArray_IndexRange(const memexpandablearray_t *l) { - size_t i, j, k; - if (!l->numarrays) - return 0; - i = l->numarrays - 1; - for (j = 0, k = 0;k < l->arrays[i].numflaggedrecords;j++) - if (l->arrays[i].allocflags[j]) - k++; - return l->numrecordsperarray * i + j; + size_t i, j, k, end = 0; + for (i = 0;i < l->numarrays;i++) + { + for (j = 0, k = 0;k < l->arrays[i].numflaggedrecords;j++) + { + if (l->arrays[i].allocflags[j]) + { + end = l->numrecordsperarray * i + j + 1; + k++; + } + } + } + return end; } -void *Mem_ExpandableArray_RecordAtIndex(memexpandablearray_t *l, size_t index) +void *Mem_ExpandableArray_RecordAtIndex(const memexpandablearray_t *l, size_t index) { size_t i, j; i = index / l->numrecordsperarray; j = index % l->numrecordsperarray; if (i >= l->numarrays || !l->arrays[i].allocflags[j]) return NULL; - return (void *)l->arrays[i].data + j * l->recordsize; + return (void *)(l->arrays[i].data + j * l->recordsize); } @@ -506,7 +605,7 @@ void Mem_PrintStats(void) { if ((pool->flags & POOLFLAG_TEMP) && pool->chain) { - Con_Printf("Memory pool %p has sprung a leak totalling %lu bytes (%.3fMB)! Listing contents...\n", pool, (unsigned long)pool->totalsize, pool->totalsize / 1048576.0); + Con_Printf("Memory pool %p has sprung a leak totalling %lu bytes (%.3fMB)! Listing contents...\n", (void *)pool, (unsigned long)pool->totalsize, pool->totalsize / 1048576.0); for (mem = pool->chain;mem;mem = mem->next) Con_Printf("%10lu bytes allocated at %s:%i\n", (unsigned long)mem->size, mem->filename, mem->fileline); } @@ -553,10 +652,21 @@ void MemStats_f(void) { Mem_CheckSentinelsGlobal(); R_TextureStats_Print(false, false, true); + GL_Mesh_ListVBOs(false); Mem_PrintStats(); } +char* Mem_strdup (mempool_t *pool, const char* s) +{ + char* p; + size_t sz = strlen (s) + 1; + if (s == NULL) return NULL; + p = (char*)Mem_Alloc (pool, sz); + strlcpy (p, s, sz); + return p; +} + /* ======================== Memory_Init @@ -564,6 +674,9 @@ Memory_Init */ void Memory_Init (void) { +#if MEMPARANOIA + sentinel_seed = rand(); +#endif poolchain = NULL; tempmempool = Mem_AllocPool("Temporary Memory", POOLFLAG_TEMP, NULL); zonemempool = Mem_AllocPool("Zone", 0, NULL);