X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=zone.c;h=b357a013aeec18f0c7d491a081608c37c6c764c7;hp=2aa575e786b442cd96a59f683c856f4f89bac3da;hb=e2e22c8380e0e9e6be93a25ebf201ca932a8b7bc;hpb=2af7bf1a4eb9a5c9a1cfe76f9f8690523bafbd3e diff --git a/zone.c b/zone.c index 2aa575e7..b357a013 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) @@ -45,7 +39,7 @@ void *mem_mutex = NULL; # define FILE_BACKED_MALLOC 0 #endif -// LordHavoc: enables our own low-level allocator (instead of malloc) +// LadyHavoc: enables our own low-level allocator (instead of malloc) #ifndef MEMCLUMPING # define MEMCLUMPING 0 #endif @@ -93,11 +87,11 @@ static memclump_t *clumpchain = NULL; #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)"}; -cvar_t developer_memoryreportlargerthanmb = {0, "developer_memorylargerthanmb", "16", "prints debugging information about memory allocations over this size"}; -cvar_t sys_memsize_physical = {CVAR_READONLY, "sys_memsize_physical", "", "physical memory size in MB (or empty if unknown)"}; -cvar_t sys_memsize_virtual = {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); @@ -204,14 +201,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 +312,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; @@ -657,7 +654,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; @@ -758,9 +755,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; @@ -845,16 +842,16 @@ void Mem_PrintList(size_t minallocationsize) } } -static void MemList_f(void) +static void MemList_f(cmd_state_t *cmd) { - switch(Cmd_Argc()) + switch(Cmd_Argc(cmd)) { case 1: Mem_PrintList(1<<30); Mem_PrintStats(); break; case 2: - Mem_PrintList(atoi(Cmd_Argv(1)) * 1024); + Mem_PrintList(atoi(Cmd_Argv(cmd, 1)) * 1024); Mem_PrintStats(); break; default: @@ -863,11 +860,9 @@ static void MemList_f(void) } } -static void MemStats_f(void) +static void MemStats_f(cmd_state_t *cmd) { Mem_CheckSentinelsGlobal(); - R_TextureStats_Print(false, false, true); - GL_Mesh_ListVBOs(false); Mem_PrintStats(); } @@ -916,8 +911,9 @@ void Memory_Shutdown (void) void Memory_Init_Commands (void) { - Cmd_AddCommand ("memstats", MemStats_f, "prints memory system statistics"); - Cmd_AddCommand ("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); Cvar_RegisterVariable (&developer_memoryreportlargerthanmb);