void *_Mem_Alloc(mempool_t *pool, int size, char *filename, int fileline)
{
+#if MEMCLUMPING
int i, j, k, needed, endbit, largest;
memclump_t *clump, **clumpchainpointer;
+#endif
memheader_t *mem;
if (size <= 0)
return NULL;
if (pool == NULL)
Sys_Error("Mem_Alloc: pool == NULL (alloc at %s:%i)", filename, fileline);
+ Con_DPrintf("Mem_Alloc: pool %s, file %s:%i, size %i bytes\n", pool->name, filename, fileline, size);
pool->totalsize += size;
+#if MEMCLUMPING
if (size < 4096)
{
// clumping
clump->largestavailable = MEMBITS - needed;
j = 0;
choseclump:
- mem = (memheader_t *)((long) clump->block + j * MEMUNIT);
+ mem = (memheader_t *)((qbyte *) clump->block + j * MEMUNIT);
mem->clump = clump;
clump->blocksinuse += needed;
for (i = j + needed;j < i;j++)
else
{
// big allocations are not clumped
+#endif
pool->realsize += sizeof(memheader_t) + size + sizeof(int);
mem = malloc(sizeof(memheader_t) + size + sizeof(int));
if (mem == NULL)
Sys_Error("Mem_Alloc: out of memory (alloc at %s:%i)", filename, fileline);
+#if MEMCLUMPING
mem->clump = NULL;
}
+#endif
mem->filename = filename;
mem->fileline = fileline;
mem->size = size;
mem->pool = pool;
- mem->sentinel1 = MEMHEADER_SENTINEL;
- *((int *)((long) mem + sizeof(memheader_t) + mem->size)) = MEMHEADER_SENTINEL;
+ mem->sentinel1 = MEMHEADER_SENTINEL1;
+ // we have to use only a single byte for this sentinel, because it may not be aligned, and some platforms can't use unaligned accesses
+ *((qbyte *) mem + sizeof(memheader_t) + mem->size) = MEMHEADER_SENTINEL2;
// append to head of list
mem->chain = pool->chain;
pool->chain = mem;
- memset((void *)((long) mem + sizeof(memheader_t)), 0, mem->size);
- return (void *)((long) mem + sizeof(memheader_t));
+ memset((void *)((qbyte *) mem + sizeof(memheader_t)), 0, mem->size);
+ return (void *)((qbyte *) mem + sizeof(memheader_t));
}
void _Mem_Free(void *data, char *filename, int fileline)
{
+#if MEMCLUMPING
int i, firstblock, endblock;
memclump_t *clump, **clumpchainpointer;
+#endif
memheader_t *mem, **memchainpointer;
mempool_t *pool;
if (data == NULL)
Sys_Error("Mem_Free: data == NULL (called at %s:%i)", filename, fileline);
- mem = (memheader_t *)((long) data - sizeof(memheader_t));
- if (mem->sentinel1 != MEMHEADER_SENTINEL)
+ mem = (memheader_t *)((qbyte *) data - sizeof(memheader_t));
+ if (mem->sentinel1 != MEMHEADER_SENTINEL1)
Sys_Error("Mem_Free: trashed header sentinel 1 (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline);
- if (*((int *)((long) mem + sizeof(memheader_t) + mem->size)) != MEMHEADER_SENTINEL)
+ if (*((qbyte *) mem + sizeof(memheader_t) + mem->size) != MEMHEADER_SENTINEL2)
Sys_Error("Mem_Free: trashed header sentinel 2 (alloc at %s:%i, free at %s:%i)", mem->filename, mem->fileline, filename, fileline);
pool = mem->pool;
+ Con_DPrintf("Mem_Free: pool %s, alloc %s:%i, free %s:%i, size %i bytes\n", pool->name, mem->filename, mem->fileline, filename, fileline, mem->size);
for (memchainpointer = &pool->chain;*memchainpointer;memchainpointer = &(*memchainpointer)->chain)
{
if (*memchainpointer == mem)
{
*memchainpointer = mem->chain;
pool->totalsize -= mem->size;
+#if MEMCLUMPING
if ((clump = mem->clump))
{
if (clump->sentinel1 != MEMCLUMP_SENTINEL)
Sys_Error("Mem_Free: trashed clump sentinel 1 (free at %s:%i)", filename, fileline);
if (clump->sentinel2 != MEMCLUMP_SENTINEL)
Sys_Error("Mem_Free: trashed clump sentinel 2 (free at %s:%i)", filename, fileline);
- firstblock = ((long) mem - (long) clump->block);
+ firstblock = ((qbyte *) mem - (qbyte *) clump->block);
if (firstblock & (MEMUNIT - 1))
Sys_Error("Mem_Free: address not valid in clump (free at %s:%i)", filename, fileline);
firstblock /= MEMUNIT;
}
else
{
+#endif
pool->realsize -= sizeof(memheader_t) + mem->size + sizeof(int);
memset(mem, 0xBF, sizeof(memheader_t) + mem->size + sizeof(int));
free(mem);
+#if MEMCLUMPING
}
+#endif
return;
}
}
mempool_t *_Mem_AllocPool(char *name, char *filename, int fileline)
{
-// int i;
mempool_t *pool;
pool = malloc(sizeof(mempool_t));
if (pool == NULL)
Sys_Error("Mem_AllocPool: out of memory (allocpool at %s:%i)", filename, fileline);
memset(pool, 0, sizeof(mempool_t));
+ pool->sentinel1 = MEMHEADER_SENTINEL1;
+ pool->sentinel2 = MEMHEADER_SENTINEL1;
+ pool->filename = filename;
+ pool->fileline = fileline;
pool->chain = NULL;
pool->totalsize = 0;
pool->realsize = sizeof(mempool_t);
strcpy(pool->name, name);
-// for (i = 0;i < (POOLNAMESIZE - 1) && name[i];i++)
-// pool->name[i] = name[i];
-// for (i = 0;i < POOLNAMESIZE;i++)
-// pool->name[i] = 0;
pool->next = poolchain;
poolchain = pool;
return pool;
mempool_t **chainaddress;
if (*pool)
{
+ if ((*pool)->sentinel1 != MEMHEADER_SENTINEL1)
+ Sys_Error("Mem_FreePool: trashed pool sentinel 1 (allocpool at %s:%i, freepool at %s:%i)", (*pool)->filename, (*pool)->fileline, filename, fileline);
+ if ((*pool)->sentinel2 != MEMHEADER_SENTINEL1)
+ Sys_Error("Mem_FreePool: trashed pool sentinel 2 (allocpool at %s:%i, freepool at %s:%i)", (*pool)->filename, (*pool)->fileline, filename, fileline);
// unlink pool from chain
for (chainaddress = &poolchain;*chainaddress && *chainaddress != *pool;chainaddress = &((*chainaddress)->next));
if (*chainaddress != *pool)
// free memory owned by the pool
while ((*pool)->chain)
- Mem_Free((void *)((long) (*pool)->chain + sizeof(memheader_t)));
+ Mem_Free((void *)((qbyte *) (*pool)->chain + sizeof(memheader_t)));
// free the pool itself
memset(*pool, 0xBF, sizeof(mempool_t));
{
if (pool == NULL)
Sys_Error("Mem_EmptyPool: pool == NULL (emptypool at %s:%i)", filename, fileline);
+ if (pool->sentinel1 != MEMHEADER_SENTINEL1)
+ Sys_Error("Mem_EmptyPool: trashed pool sentinel 1 (allocpool at %s:%i, emptypool at %s:%i)", pool->filename, pool->fileline, filename, fileline);
+ if (pool->sentinel2 != MEMHEADER_SENTINEL1)
+ 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_Free((void *)((long) pool->chain + sizeof(memheader_t)));
+ Mem_Free((void *)((qbyte *) pool->chain + sizeof(memheader_t)));
}
void _Mem_CheckSentinels(void *data, char *filename, int fileline)
if (data == NULL)
Sys_Error("Mem_CheckSentinels: data == NULL (sentinel check at %s:%i)", filename, fileline);
- mem = (memheader_t *)((long) data - sizeof(memheader_t));
- if (mem->sentinel1 != MEMHEADER_SENTINEL)
+ mem = (memheader_t *)((qbyte *) data - sizeof(memheader_t));
+ if (mem->sentinel1 != MEMHEADER_SENTINEL1)
Sys_Error("Mem_CheckSentinels: trashed header sentinel 1 (block allocated at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline);
- if (*((int *)((long) mem + sizeof(memheader_t) + mem->size)) != MEMHEADER_SENTINEL)
+ if (*((qbyte *) mem + sizeof(memheader_t) + mem->size) != MEMHEADER_SENTINEL2)
Sys_Error("Mem_CheckSentinels: trashed header sentinel 2 (block allocated at %s:%i, sentinel check at %s:%i)", mem->filename, mem->fileline, filename, fileline);
}
+#if MEMCLUMPING
static void _Mem_CheckClumpSentinels(memclump_t *clump, char *filename, int fileline)
{
// this isn't really very useful
if (clump->sentinel2 != MEMCLUMP_SENTINEL)
Sys_Error("Mem_CheckClumpSentinels: trashed sentinel 2 (sentinel check at %s:%i)", filename, fileline);
}
+#endif
void _Mem_CheckSentinelsGlobal(char *filename, int fileline)
{
memheader_t *mem;
+#if MEMCLUMPING
memclump_t *clump;
+#endif
mempool_t *pool;
for (pool = poolchain;pool;pool = pool->next)
{
+ if (pool->sentinel1 != MEMHEADER_SENTINEL1)
+ Sys_Error("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_SENTINEL1)
+ 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->chain)
- _Mem_CheckSentinels((void *)((long) mem + sizeof(memheader_t)), filename, fileline);
+ _Mem_CheckSentinels((void *)((qbyte *) mem + sizeof(memheader_t)), filename, fileline);
+#if MEMCLUMPING
+ for (pool = poolchain;pool;pool = pool->next)
for (clump = pool->clumpchain;clump;clump = clump->chain)
_Mem_CheckClumpSentinels(clump, filename, fileline);
- }
+#endif
}
// used for temporary memory allocations around the engine, not for longterm