*/
// 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;
char *tmpdir = getenv("TEMP");
mmap_data_t *data;
int fd;
- size += sizeof(mmap-data_t); // waste block
+ size += sizeof(mmap_data_t); // waste block
dpsnprintf(vabuf, sizeof(vabuf), "%s/darkplaces.XXXXXX", tmpdir ? tmpdir : "/tmp");
fd = mkstemp(vabuf);
if(fd < 0)
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);
// (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;
Sys_Sleep(1000);
}
return NULL;
+#endif
}
#endif
#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;
return NULL;
}
if (pool == NULL)
- Sys_Error("Mem_Alloc: pool == NULL (alloc at %s:%i)", filename, fileline);
+ {
+ if(olddata)
+ pool = ((memheader_t *)((unsigned char *) olddata - sizeof(memheader_t)))->pool;
+ else
+ Sys_Error("Mem_Alloc: pool == NULL (alloc at %s:%i)", filename, fileline);
+ }
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));
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);
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);
_Mem_FreeBlock((memheader_t *)((unsigned char *) data - sizeof(memheader_t)), filename, fileline);
}
-mempool_t *_Mem_AllocPool(const char *name, int flags, mempool_t *parent, const char *filename, int fileline)
+mempool_t *_Mem_AllocPool(const char *name, unsigned flags, mempool_t *parent, const char *filename, int fileline)
{
mempool_t *pool;
if (developer_memorydebug.integer)
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));
+ dp_strlcpy (pool->name, name, sizeof (pool->name));
pool->parent = parent;
pool->next = poolchain;
poolchain = pool;
*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; temp = iter = iter->next)
+ for(iter = poolchain; iter; iter = temp) {
+ temp = iter->next;
if(iter->parent == pool)
_Mem_FreePool(&temp, filename, fileline);
+ }
// free the pool itself
Clump_FreeBlock(pool, sizeof(*pool));
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)
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)
#endif
}
-qboolean Mem_IsAllocated(mempool_t *pool, void *data)
+qbool Mem_IsAllocated(mempool_t *pool, const void *data)
{
memheader_t *header;
memheader_t *target;
{
// 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;
}
memset(l, 0, sizeof(*l));
}
-// VorteX: hacked Mem_ExpandableArray_AllocRecord, it does allocate record at certain index
-void *Mem_ExpandableArray_AllocRecordAtIndex(memexpandablearray_t *l, size_t index)
-{
- size_t j;
- if (index >= l->numarrays)
- {
- if (l->numarrays == l->maxarrays)
- {
- memexpandablearray_array_t *oldarrays = l->arrays;
- l->maxarrays = max(l->maxarrays * 2, 128);
- 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));
- Mem_Free(oldarrays);
- }
- }
- l->arrays[index].numflaggedrecords = 0;
- l->arrays[index].data = (unsigned char *) Mem_Alloc(l->mempool, (l->recordsize + 1) * l->numrecordsperarray);
- l->arrays[index].allocflags = l->arrays[index].data + l->recordsize * l->numrecordsperarray;
- l->numarrays++;
- }
- if (l->arrays[index].numflaggedrecords < l->numrecordsperarray)
- {
- for (j = 0;j < l->numrecordsperarray;j++)
- {
- if (!l->arrays[index].allocflags[j])
- {
- l->arrays[index].allocflags[j] = true;
- l->arrays[index].numflaggedrecords++;
- memset(l->arrays[index].data + l->recordsize * j, 0, l->recordsize);
- return (void *)(l->arrays[index].data + l->recordsize * j);
- }
- }
- }
- return NULL;
-}
-
void *Mem_ExpandableArray_AllocRecord(memexpandablearray_t *l)
{
size_t i, j;
{
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;
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)
+ Con_Printf(CON_WARN "Memory pool %p has sprung a leak totalling %lu bytes (%.3fMB)! Listing contents...\n", (void *)pool, (unsigned long)pool->totalsize, pool->totalsize / 1048576.0);
+ 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);
}
}
{
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);
}
}
-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();
}
-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);
- strlcpy (p, s, sz);
+ p = (char*)_Mem_Alloc (pool, NULL, sz, alignof(char), filename, fileline);
+ dp_strlcpy (p, s, sz);
return p;
}
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