OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Merged the GC branch back into the trunk, so now it can receive more

Browse source 
testing from the people who download SVN trunk builds.

SVN r795 (trunk)
This commit is contained in:
Randy Heit 2008-03-12 02:56:11 +00:00
commit f2660dc336
88 changed files with 2541 additions and 1523 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/m_alloc.cpp
View file

@ -33,18 +33,8 @@
*/
#include "i_system.h"
#include "stats.h"
#include <malloc.h>
ADD_STAT(mem)
{
FString out;
out.Format("Alloc: %uKB", (AllocBytes + 1023) >> 10);
return out;
}
size_t AllocBytes;
#ifndef _MSC_VER
#define _NORMAL_BLOCK 0
#define _malloc_dbg(s,b,f,l) malloc(s)
@ -62,7 +52,7 @@ void *M_Malloc(size_t size)
if (block == NULL)
I_FatalError("Could not malloc %u bytes", size);
AllocBytes += _msize(block);
GC::AllocBytes += _msize(block);
return block;
}
@ -70,14 +60,14 @@ void *M_Realloc(void *memblock, size_t size)
{
if (memblock != NULL)
{
AllocBytes -= _msize(memblock);
GC::AllocBytes -= _msize(memblock);
}
void *block = realloc(memblock, size);
if (block == NULL)
{
I_FatalError("Could not realloc %u bytes", size);
}
AllocBytes += _msize(block);
GC::AllocBytes += _msize(block);
return block;
}
#else
@ -92,7 +82,7 @@ void *M_Malloc_Dbg(size_t size, const char *file, int lineno)
if (block == NULL)
I_FatalError("Could not malloc %u bytes", size);
AllocBytes += _msize(block);
GC::AllocBytes += _msize(block);
return block;
}
@ -100,14 +90,14 @@ void *M_Realloc_Dbg(void *memblock, size_t size, const char *file, int lineno)
{
if (memblock != NULL)
{
AllocBytes -= _msize(memblock);
GC::AllocBytes -= _msize(memblock);
}
void *block = _realloc_dbg(memblock, size, _NORMAL_BLOCK, file, lineno);
if (block == NULL)
{
I_FatalError("Could not realloc %u bytes", size);
}
AllocBytes += _msize(block);
GC::AllocBytes += _msize(block);
return block;
}
#endif
@ -116,7 +106,7 @@ void M_Free (void *block)
{
if (block != NULL)
{
AllocBytes -= _msize(block);
GC::AllocBytes -= _msize(block);
free(block);
}
}