X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=zone.c;h=40708bd6913ed713811d61c4c8443446db09c806;hp=5a0c8987a0c3e2f184999aa0ed09e2ff46dc72bc;hb=7c62e71683de5672379f033664504eb10d431544;hpb=8637b1ec26ca72f92d1ef8faf23a2f124c1f4ff3 diff --git a/zone.c b/zone.c index 5a0c8987..40708bd6 100644 --- a/zone.c +++ b/zone.c @@ -19,8 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ // Z_zone.c -#include "quakedef.h" -#include "thread.h" +#include "darkplaces.h" #ifdef WIN32 #include @@ -29,15 +28,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #endif -#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; -qboolean mem_bigendian = false; +qbool mem_bigendian = false; void *mem_mutex = NULL; // divVerent: enables file backed malloc using mmap to conserve swap space (instead of malloc) @@ -93,11 +87,11 @@ static memclump_t *clumpchain = NULL; #endif -cvar_t developer_memory = {CVAR_CLIENT | CVAR_SERVER, "developer_memory", "0", "prints debugging information about memory allocations"}; -cvar_t developer_memorydebug = {CVAR_CLIENT | CVAR_SERVER, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"}; -cvar_t developer_memoryreportlargerthanmb = {CVAR_CLIENT | CVAR_SERVER, "developer_memorylargerthanmb", "16", "prints debugging information about memory allocations over this size"}; -cvar_t sys_memsize_physical = {CVAR_CLIENT | CVAR_SERVER | CVAR_READONLY, "sys_memsize_physical", "", "physical memory size in MB (or empty if unknown)"}; -cvar_t sys_memsize_virtual = {CVAR_CLIENT | CVAR_SERVER | CVAR_READONLY, "sys_memsize_virtual", "", "virtual memory size in MB (or empty if unknown)"}; +cvar_t developer_memory = {CF_CLIENT | CF_SERVER, "developer_memory", "0", "prints debugging information about memory allocations"}; +cvar_t developer_memorydebug = {CF_CLIENT | CF_SERVER, "developer_memorydebug", "0", "enables memory corruption checks (very slow)"}; +cvar_t developer_memoryreportlargerthanmb = {CF_CLIENT | CF_SERVER, "developer_memorylargerthanmb", "16", "prints debugging information about memory allocations over this size"}; +cvar_t sys_memsize_physical = {CF_CLIENT | CF_SERVER | CF_READONLY, "sys_memsize_physical", "", "physical memory size in MB (or empty if unknown)"}; +cvar_t sys_memsize_virtual = {CF_CLIENT | CF_SERVER | CF_READONLY, "sys_memsize_virtual", "", "virtual memory size in MB (or empty if unknown)"}; static mempool_t *poolchain = NULL; @@ -107,6 +101,9 @@ void Mem_PrintList(size_t minallocationsize); #if FILE_BACKED_MALLOC #include #include +#ifndef MAP_NORESERVE +#define MAP_NORESERVE 0 +#endif typedef struct mmap_data_s { size_t len; @@ -127,7 +124,7 @@ static void *mmap_malloc(size_t size) data = (unsigned char *) mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_NORESERVE, fd, 0); close(fd); unlink(vabuf); - if(!data) + if(!data || data == (void *)-1) return NULL; data->len = size; return (void *) (data + 1); @@ -149,6 +146,9 @@ static void mmap_free(void *mem) // (Windows growing its swapfile for example) static void *attempt_malloc(size_t size) { +#ifndef WIN32 + return malloc(size); +#else void *base; // try for half a second or so unsigned int attempts = 500; @@ -160,6 +160,7 @@ static void *attempt_malloc(size_t size) Sys_Sleep(1000); } return NULL; +#endif } #endif @@ -204,14 +205,14 @@ static void *Clump_AllocBlock(size_t size) #if MEMCLUMPING if (size <= MEMCLUMPSIZE) { - int index; - unsigned int bit; - unsigned int needbits; - unsigned int startbit; - unsigned int endbit; - unsigned int needints; - int startindex; - int endindex; + intptr_t index; + size_t bit; + size_t needbits; + size_t startbit; + size_t endbit; + size_t needints; + intptr_t startindex; + intptr_t endindex; unsigned int value; unsigned int mask; unsigned int *array; @@ -315,10 +316,10 @@ nofreeblock: static void Clump_FreeBlock(void *base, size_t size) { #if MEMCLUMPING - unsigned int needbits; - unsigned int startbit; - unsigned int endbit; - unsigned int bit; + size_t needbits; + size_t startbit; + size_t endbit; + size_t bit; memclump_t **clumpchainpointer; memclump_t *clump; unsigned char *start = (unsigned char *)base; @@ -422,11 +423,7 @@ void *_Mem_Alloc(mempool_t *pool, void *olddata, size_t size, size_t alignment, memcpy((unsigned char *) mem + sizeof(memheader_t) + mem->size, &sentinel2, sizeof(sentinel2)); // append to head of list - mem->next = pool->chain; - mem->prev = NULL; - pool->chain = mem; - if (mem->next) - mem->next->prev = mem; + List_Add(&mem->list, &pool->chain); if (mem_mutex) Thread_UnlockMutex(mem_mutex); @@ -467,16 +464,11 @@ static void _Mem_FreeBlock(memheader_t *mem, const char *filename, int fileline) if (developer_memory.integer) Con_DPrintf("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)); // unlink memheader from doubly linked list - if ((mem->prev ? mem->prev->next != mem : pool->chain != mem) || (mem->next && mem->next->prev != mem)) + if (mem->list.prev->next != &mem->list || mem->list.next->prev != &mem->list) Sys_Error("Mem_Free: not allocated or double freed (free at %s:%i)", filename, fileline); if (mem_mutex) Thread_LockMutex(mem_mutex); - if (mem->prev) - mem->prev->next = mem->next; - else - pool->chain = mem->next; - if (mem->next) - mem->next->prev = mem->prev; + List_Delete(&mem->list); // memheader has been unlinked, do the actual free now size = mem->size; realsize = sizeof(memheader_t) + size + sizeof(sentinel2); @@ -525,7 +517,7 @@ mempool_t *_Mem_AllocPool(const char *name, int flags, mempool_t *parent, const pool->filename = filename; pool->fileline = fileline; pool->flags = flags; - pool->chain = NULL; + List_Create(&pool->chain); pool->totalsize = 0; pool->realsize = sizeof(mempool_t); strlcpy (pool->name, name, sizeof (pool->name)); @@ -555,8 +547,8 @@ void _Mem_FreePool(mempool_t **poolpointer, const char *filename, int fileline) *chainaddress = pool->next; // free memory owned by the pool - while (pool->chain) - _Mem_FreeBlock(pool->chain, filename, fileline); + while (!List_Is_Empty(&pool->chain)) + _Mem_FreeBlock(List_First_Entry(&pool->chain, memheader_t, list), filename, fileline); // free child pools, too for(iter = poolchain; iter; iter = temp) { @@ -594,8 +586,8 @@ void _Mem_EmptyPool(mempool_t *pool, const char *filename, int fileline) Sys_Error("Mem_EmptyPool: trashed pool sentinel 2 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline); // free memory owned by the pool - while (pool->chain) - _Mem_FreeBlock(pool->chain, filename, fileline); + while (!List_Is_Empty(&pool->chain)) + _Mem_FreeBlock(List_First_Entry(&pool->chain, memheader_t, list), filename, fileline); // empty child pools, too for(chainaddress = poolchain; chainaddress; chainaddress = chainaddress->next) @@ -648,7 +640,7 @@ void _Mem_CheckSentinelsGlobal(const 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->next) + List_For_Each_Entry(mem, &pool->chain, memheader_t, list) _Mem_CheckSentinels((void *)((unsigned char *) mem + sizeof(memheader_t)), filename, fileline); #if MEMCLUMPING for (pool = poolchain;pool;pool = pool->next) @@ -657,7 +649,7 @@ void _Mem_CheckSentinelsGlobal(const char *filename, int fileline) #endif } -qboolean Mem_IsAllocated(mempool_t *pool, void *data) +qbool Mem_IsAllocated(mempool_t *pool, void *data) { memheader_t *header; memheader_t *target; @@ -666,7 +658,7 @@ qboolean Mem_IsAllocated(mempool_t *pool, void *data) { // search only one pool target = (memheader_t *)((unsigned char *) data - sizeof(memheader_t)); - for( header = pool->chain ; header ; header = header->next ) + List_For_Each_Entry(header, &pool->chain, memheader_t, list) if( header == target ) return true; } @@ -758,9 +750,9 @@ void Mem_ExpandableArray_FreeRecord(memexpandablearray_t *l, void *record) // co { j = (p - l->arrays[i].data) / l->recordsize; if (p != l->arrays[i].data + j * l->recordsize) - Sys_Error("Mem_ExpandableArray_FreeRecord: no such record %p\n", p); + Sys_Error("Mem_ExpandableArray_FreeRecord: no such record %p\n", (void *)p); if (!l->arrays[i].allocflags[j]) - Sys_Error("Mem_ExpandableArray_FreeRecord: record %p is already free!\n", p); + Sys_Error("Mem_ExpandableArray_FreeRecord: record %p is already free!\n", (void *)p); l->arrays[i].allocflags[j] = false; l->arrays[i].numflaggedrecords--; return; @@ -819,10 +811,10 @@ void Mem_PrintStats(void) Con_Printf("total allocated size: %lu bytes (%.3fMB)\n", (unsigned long)realsize, realsize / 1048576.0); for (pool = poolchain;pool;pool = pool->next) { - if ((pool->flags & POOLFLAG_TEMP) && pool->chain) + if ((pool->flags & POOLFLAG_TEMP) && !List_Is_Empty(&pool->chain)) { 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) + List_For_Each_Entry(mem, &pool->chain, memheader_t, list) Con_Printf("%10lu bytes allocated at %s:%i\n", (unsigned long)mem->size, mem->filename, mem->fileline); } } @@ -839,7 +831,7 @@ void Mem_PrintList(size_t minallocationsize) { Con_Printf("%10luk (%10luk actual) %s (%+li byte change) %s\n", (unsigned long) ((pool->totalsize + 1023) / 1024), (unsigned long)((pool->realsize + 1023) / 1024), pool->name, (long)(pool->totalsize - pool->lastchecksize), (pool->flags & POOLFLAG_TEMP) ? "TEMP" : ""); pool->lastchecksize = pool->totalsize; - for (mem = pool->chain;mem;mem = mem->next) + List_For_Each_Entry(mem, &pool->chain, memheader_t, list) if (mem->size >= minallocationsize) Con_Printf("%10lu bytes allocated at %s:%i\n", (unsigned long)mem->size, mem->filename, mem->fileline); } @@ -866,20 +858,18 @@ static void MemList_f(cmd_state_t *cmd) static void MemStats_f(cmd_state_t *cmd) { Mem_CheckSentinelsGlobal(); - R_TextureStats_Print(false, false, true); - GL_Mesh_ListVBOs(false); Mem_PrintStats(); } -char* Mem_strdup (mempool_t *pool, const char* s) +char* _Mem_strdup (mempool_t *pool, const char* s, const char *filename, int fileline) { char* p; size_t sz; if (s == NULL) return NULL; sz = strlen (s) + 1; - p = (char*)Mem_Alloc (pool, sz); + p = (char*)_Mem_Alloc (pool, NULL, sz, 16, filename, fileline); strlcpy (p, s, sz); return p; } @@ -916,8 +906,8 @@ void Memory_Shutdown (void) void Memory_Init_Commands (void) { - Cmd_AddCommand(CMD_SHARED, "memstats", MemStats_f, "prints memory system statistics"); - Cmd_AddCommand(CMD_SHARED, "memlist", MemList_f, "prints memory pool information (or if used as memlist 5 lists individual allocations of 5K or larger, 0 lists all allocations)"); + Cmd_AddCommand(CF_SHARED, "memstats", MemStats_f, "prints memory system statistics"); + Cmd_AddCommand(CF_SHARED, "memlist", MemList_f, "prints memory pool information (or if used as memlist 5 lists individual allocations of 5K or larger, 0 lists all allocations)"); Cvar_RegisterVariable (&developer_memory); Cvar_RegisterVariable (&developer_memorydebug);