return NULL;
}
if (clump->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&clump->sentinel1))
- Sys_Error("Clump_AllocBlock: trashed sentinel1\n");
+ Sys_Abort("Clump_AllocBlock: trashed sentinel1\n");
if (clump->sentinel2 != MEMHEADER_SENTINEL_FOR_ADDRESS(&clump->sentinel2))
- Sys_Error("Clump_AllocBlock: trashed sentinel2\n");
+ Sys_Abort("Clump_AllocBlock: trashed sentinel2\n");
startbit = 0;
endbit = startbit + needbits;
array = clump->bits;
// TODO: optimize
for (bit = startbit;bit < endbit;bit++)
if (clump->bits[bit>>5] & (1<<(bit & 31)))
- Sys_Error("Clump_AllocBlock: internal error (%i needbits)\n", needbits);
+ Sys_Abort("Clump_AllocBlock: internal error (%i needbits)\n", needbits);
for (bit = startbit;bit < endbit;bit++)
clump->bits[bit>>5] |= (1<<(bit & 31));
clump->blocksinuse += needbits;
if (start >= clump->block && start < clump->block + MEMCLUMPSIZE)
{
if (clump->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&clump->sentinel1))
- Sys_Error("Clump_FreeBlock: trashed sentinel1\n");
+ Sys_Abort("Clump_FreeBlock: trashed sentinel1\n");
if (clump->sentinel2 != MEMHEADER_SENTINEL_FOR_ADDRESS(&clump->sentinel2))
- Sys_Error("Clump_FreeBlock: trashed sentinel2\n");
+ Sys_Abort("Clump_FreeBlock: trashed sentinel2\n");
if (start + size > clump->block + MEMCLUMPSIZE)
- Sys_Error("Clump_FreeBlock: block overrun\n");
+ Sys_Abort("Clump_FreeBlock: block overrun\n");
// the block belongs to this clump, clear the range
needbits = (size + MEMUNIT - 1) / MEMUNIT;
startbit = (start - clump->block) / MEMUNIT;
// first verify all bits are set, otherwise this may be misaligned or a double free
for (bit = startbit;bit < endbit;bit++)
if ((clump->bits[bit>>5] & (1<<(bit & 31))) == 0)
- Sys_Error("Clump_FreeBlock: double free\n");
+ Sys_Abort("Clump_FreeBlock: double free\n");
for (bit = startbit;bit < endbit;bit++)
clump->bits[bit>>5] &= ~(1<<(bit & 31));
clump->blocksinuse -= needbits;
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);
+ Sys_Abort("Mem_Alloc: pool == NULL (alloc at %s:%i)", filename, fileline);
}
if (mem_mutex)
Thread_LockMutex(mem_mutex);
//if (developer.integer > 0 && developer_memorydebug.integer)
// _Mem_CheckSentinelsGlobal(filename, fileline);
pool->totalsize += size;
- realsize = alignment + sizeof(memheader_t) + size + sizeof(sentinel2);
+ // calculate the smallest realsize that is a multiple of alignment
+ realsize = (sizeof(memheader_t) + size + sizeof(sentinel2) + (alignment-1)) & ~(alignment-1);
pool->realsize += realsize;
base = (unsigned char *)Clump_AllocBlock(realsize);
if (base == NULL)
Mem_PrintStats();
Mem_PrintList(1<<30);
Mem_PrintStats();
- Sys_Error("Mem_Alloc: out of memory (alloc of size %f (%.3fMB) at %s:%i)", (double)realsize, (double)realsize / (1 << 20), filename, fileline);
+ Sys_Abort("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);
sentinel1 = MEMHEADER_SENTINEL_FOR_ADDRESS(&mem->sentinel);
sentinel2 = MEMHEADER_SENTINEL_FOR_ADDRESS((unsigned char *) mem + sizeof(memheader_t) + mem->size);
if (mem->sentinel != sentinel1)
- Sys_Error("Mem_Free: trashed head sentinel (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline);
+ Sys_Abort("Mem_Free: trashed head sentinel (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline);
if (memcmp((unsigned char *) mem + sizeof(memheader_t) + mem->size, &sentinel2, sizeof(sentinel2)))
- Sys_Error("Mem_Free: trashed tail sentinel (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline);
+ Sys_Abort("Mem_Free: trashed tail sentinel (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline);
pool = mem->pool;
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))
- Sys_Error("Mem_Free: not allocated or double freed (free at %s:%i)", filename, fileline);
+ if (mem->list.prev->next != &mem->list || mem->list.next->prev != &mem->list)
+ Sys_Abort("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_CheckSentinelsGlobal(filename, fileline);
if (!Mem_IsAllocated(NULL, data))
- Sys_Error("Mem_Free: data is not allocated (called at %s:%i)", filename, fileline);
+ Sys_Abort("Mem_Free: data is not allocated (called at %s:%i)", filename, fileline);
}
_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)
Mem_PrintStats();
Mem_PrintList(1<<30);
Mem_PrintStats();
- Sys_Error("Mem_AllocPool: out of memory (allocpool at %s:%i)", filename, fileline);
+ Sys_Abort("Mem_AllocPool: out of memory (allocpool at %s:%i)", filename, fileline);
}
memset(pool, 0, sizeof(mempool_t));
pool->sentinel1 = MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel1);
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;
// unlink pool from chain
for (chainaddress = &poolchain;*chainaddress && *chainaddress != pool;chainaddress = &((*chainaddress)->next));
if (*chainaddress != pool)
- Sys_Error("Mem_FreePool: pool already free (freepool at %s:%i)", filename, fileline);
+ Sys_Abort("Mem_FreePool: pool already free (freepool at %s:%i)", filename, fileline);
if (pool->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel1))
- Sys_Error("Mem_FreePool: trashed pool sentinel 1 (allocpool at %s:%i, freepool at %s:%i)", pool->filename, pool->fileline, filename, fileline);
+ Sys_Abort("Mem_FreePool: trashed pool sentinel 1 (allocpool at %s:%i, freepool at %s:%i)", pool->filename, pool->fileline, filename, fileline);
if (pool->sentinel2 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel2))
- Sys_Error("Mem_FreePool: trashed pool sentinel 2 (allocpool at %s:%i, freepool at %s:%i)", pool->filename, pool->fileline, filename, fileline);
+ Sys_Abort("Mem_FreePool: trashed pool sentinel 2 (allocpool at %s:%i, freepool at %s:%i)", pool->filename, pool->fileline, filename, 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) {
if (chainaddress == pool)
break;
if (!chainaddress)
- Sys_Error("Mem_EmptyPool: pool is already free (emptypool at %s:%i)", filename, fileline);
+ Sys_Abort("Mem_EmptyPool: pool is already free (emptypool at %s:%i)", filename, fileline);
}
if (pool == NULL)
- Sys_Error("Mem_EmptyPool: pool == NULL (emptypool at %s:%i)", filename, fileline);
+ Sys_Abort("Mem_EmptyPool: pool == NULL (emptypool at %s:%i)", filename, fileline);
if (pool->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel1))
- Sys_Error("Mem_EmptyPool: trashed pool sentinel 1 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline);
+ Sys_Abort("Mem_EmptyPool: trashed pool sentinel 1 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline);
if (pool->sentinel2 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel2))
- Sys_Error("Mem_EmptyPool: trashed pool sentinel 2 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline);
+ Sys_Abort("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)
unsigned int sentinel2;
if (data == NULL)
- Sys_Error("Mem_CheckSentinels: data == NULL (sentinel check at %s:%i)", filename, fileline);
+ Sys_Abort("Mem_CheckSentinels: data == NULL (sentinel check at %s:%i)", filename, fileline);
mem = (memheader_t *)((unsigned char *) data - sizeof(memheader_t));
sentinel1 = MEMHEADER_SENTINEL_FOR_ADDRESS(&mem->sentinel);
sentinel2 = MEMHEADER_SENTINEL_FOR_ADDRESS((unsigned char *) mem + sizeof(memheader_t) + mem->size);
if (mem->sentinel != sentinel1)
- Sys_Error("Mem_Free: trashed head sentinel (alloc at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline);
+ Sys_Abort("Mem_Free: trashed head sentinel (alloc at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline);
if (memcmp((unsigned char *) mem + sizeof(memheader_t) + mem->size, &sentinel2, sizeof(sentinel2)))
- Sys_Error("Mem_Free: trashed tail sentinel (alloc at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline);
+ Sys_Abort("Mem_Free: trashed tail sentinel (alloc at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline);
}
#if MEMCLUMPING
{
// this isn't really very useful
if (clump->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&clump->sentinel1))
- Sys_Error("Mem_CheckClumpSentinels: trashed sentinel 1 (sentinel check at %s:%i)", filename, fileline);
+ Sys_Abort("Mem_CheckClumpSentinels: trashed sentinel 1 (sentinel check at %s:%i)", filename, fileline);
if (clump->sentinel2 != MEMHEADER_SENTINEL_FOR_ADDRESS(&clump->sentinel2))
- Sys_Error("Mem_CheckClumpSentinels: trashed sentinel 2 (sentinel check at %s:%i)", filename, fileline);
+ Sys_Abort("Mem_CheckClumpSentinels: trashed sentinel 2 (sentinel check at %s:%i)", filename, fileline);
}
#endif
for (pool = poolchain;pool;pool = pool->next)
{
if (pool->sentinel1 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel1))
- Sys_Error("Mem_CheckSentinelsGlobal: trashed pool sentinel 1 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, fileline);
+ Sys_Abort("Mem_CheckSentinelsGlobal: trashed pool sentinel 1 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, fileline);
if (pool->sentinel2 != MEMHEADER_SENTINEL_FOR_ADDRESS(&pool->sentinel2))
- Sys_Error("Mem_CheckSentinelsGlobal: trashed pool sentinel 2 (allocpool at %s:%i, sentinel check at %s:%i)", pool->filename, pool->fileline, filename, fileline);
+ Sys_Abort("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
}
-qbool 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;
}
{
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", (void *)p);
+ Sys_Abort("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", (void *)p);
+ Sys_Abort("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);
}
}
-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;
}
projects / xonotic / darkplaces.git / blobdiff