#include "darkplaces.h"
-void R_TextureStats_Print(qbool, qbool, qbool);
-void GL_Mesh_ListVBOs(qbool);
-
#ifdef WIN32
#include <windows.h>
#include <winbase.h>
// (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;
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);
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));
*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) {
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, list)
_Mem_CheckSentinels((void *)((unsigned char *) mem + sizeof(memheader_t)), filename, fileline);
#if MEMCLUMPING
for (pool = poolchain;pool;pool = pool->next)
{
// 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, list)
if( header == target )
return true;
}
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, 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, list)
if (mem->size >= minallocationsize)
Con_Printf("%10lu bytes allocated at %s:%i\n", (unsigned long)mem->size, mem->filename, mem->fileline);
}
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;
}
projects / xonotic / darkplaces.git / blobdiff