*/
// Z_zone.c
-#include "quakedef.h"
-#include "thread.h"
+#include "darkplaces.h"
#ifdef WIN32
#include <windows.h>
#include <unistd.h>
#endif
-#ifdef _MSC_VER
-#include <vadefs.h>
-#else
-#include <stdint.h>
-#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)
# 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
#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 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;
#if FILE_BACKED_MALLOC
#include <stdlib.h>
#include <sys/mman.h>
+#ifndef MAP_NORESERVE
+#define MAP_NORESERVE 0
+#endif
typedef struct mmap_data_s
{
size_t len;
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);
#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;
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;
}
if (mem_mutex)
Thread_LockMutex(mem_mutex);
- if (developer_memory.integer)
- Con_DPrintf("Mem_Alloc: pool %s, file %s:%i, size %i bytes\n", pool->name, filename, fileline, (int)size);
+ if (developer_memory.integer || size >= developer_memoryreportlargerthanmb.value * 1048576)
+ Con_DPrintf("Mem_Alloc: pool %s, file %s:%i, size %f bytes (%f MB)\n", pool->name, filename, fileline, (double)size, (double)size / 1048576.0f);
//if (developer.integer > 0 && developer_memorydebug.integer)
// _Mem_CheckSentinelsGlobal(filename, fileline);
pool->totalsize += size;
realsize = alignment + sizeof(memheader_t) + size + sizeof(sentinel2);
pool->realsize += realsize;
base = (unsigned char *)Clump_AllocBlock(realsize);
- if (base== NULL)
+ if (base == NULL)
{
Mem_PrintList(0);
Mem_PrintStats();
Mem_PrintList(1<<30);
Mem_PrintStats();
- Sys_Error("Mem_Alloc: out of memory (alloc at %s:%i)", filename, fileline);
+ Sys_Error("Mem_Alloc: out of memory (alloc of size %f (%.3fMB) at %s:%i)", (double)realsize, (double)realsize / (1 << 20), filename, fileline);
}
// calculate address that aligns the end of the memheader_t to the specified alignment
mem = (memheader_t*)((((size_t)base + sizeof(memheader_t) + (alignment-1)) & ~(alignment-1)) - sizeof(memheader_t));
#endif
}
-qboolean Mem_IsAllocated(mempool_t *pool, void *data)
+qbool Mem_IsAllocated(mempool_t *pool, void *data)
{
memheader_t *header;
memheader_t *target;
{
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;
}
}
-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:
}
}
-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();
}
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);
Cvar_RegisterVariable (&sys_memsize_physical);
Cvar_RegisterVariable (&sys_memsize_virtual);
projects / xonotic / darkplaces.git / blobdiff