darkplaces/gmqcc
0
0
Fork 0
mirror of https://github.com/DarkPlacesEngine/gmqcc.git synced 2024-11-23 20:33:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

mem_r to realloc

Browse source
This commit is contained in:
Wolfgang (Blub) Bumiller 2012-11-10 11:16:19 +01:00
parent 04fd3d04d9
commit 09e18e1bbf
2 changed files with 51 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gmqcc.h
View file

@ -193,6 +193,7 @@ FILE *util_fopen(const char *filename, const char *mode);
void *util_memory_a (unsigned int, unsigned int, const char *);
void util_memory_d (void *, unsigned int, const char *);
void *util_memory_r (void *, unsigned int, unsigned int, const char *);
void util_meminfo ();
bool util_strupper (const char *);
@ -214,11 +215,13 @@ uint16_t util_crc16(uint16_t crc, const char *data, size_t len);
uint32_t util_crc32(uint32_t crc, const char *data, size_t len);
#ifdef NOTRACK
# define mem_a(x) malloc(x)
# define mem_d(x) free (x)
# define mem_a(x) malloc(x)
# define mem_d(x) free (x)
# define mem_r(x,y) realloc((x),(y))
#else
# define mem_a(x) util_memory_a((x), __LINE__, __FILE__)
# define mem_d(x) util_memory_d((x), __LINE__, __FILE__)
# define mem_a(x) util_memory_a((x), __LINE__, __FILE__)
# define mem_d(x) util_memory_d((x), __LINE__, __FILE__)
# define mem_r(x,y) util_memory_r((x), (y), __LINE__, __FILE__)
#endif
/*

52
util.c
View file

@ -41,8 +41,8 @@ static struct memblock_t *mem_start = NULL;
void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
struct memblock_t *info = malloc(sizeof(struct memblock_t) + byte);
void *data =(void*)((unsigned char*)info+sizeof(struct memblock_t));
if (!data) return NULL;
void *data = (void*)(info+1);
if (!info) return NULL;
info->line = line;
info->byte = byte;
info->file = file;
@ -52,7 +52,7 @@ void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
mem_start->prev = info;
mem_start = info;
util_debug("MEM", "allocation: % 8u (bytes) address 0x%08X @ %s:%u\n", byte, data, file, line);
util_debug("MEM", "allocation: % 8u (bytes) address 0x%08X @ %s:%u\n", byte, data, file, line);
mem_at++;
mem_ab += info->byte;
@ -60,14 +60,12 @@ void *util_memory_a(unsigned int byte, unsigned int line, const char *file) {
}
void util_memory_d(void *ptrn, unsigned int line, const char *file) {
void *data = NULL;
struct memblock_t *info = NULL;
if (!ptrn) return;
data = (void*)((unsigned char *)ptrn-sizeof(struct memblock_t));
info = (struct memblock_t*)data;
info = ((struct memblock_t*)ptrn - 1);
util_debug("MEM", "released: % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, ptrn, file, line);
util_debug("MEM", "released: % 8u (bytes) address 0x%08X @ %s:%u\n", info->byte, ptrn, file, line);
mem_db += info->byte;
mem_dt++;
@ -78,7 +76,45 @@ void util_memory_d(void *ptrn, unsigned int line, const char *file) {
if (info == mem_start)
mem_start = info->next;
free(data);
free(info);
}
void *util_memory_r(void *ptrn, unsigned int byte, unsigned int line, const char *file) {
struct memblock_t *oldinfo = NULL;
struct memblock_t *newinfo;
if (!ptrn)
return util_memory_a(byte, line, file);
oldinfo = ((struct memblock_t*)ptrn - 1);
newinfo = malloc(sizeof(struct memblock_t) + byte);
util_debug("MEM", "reallocation: % 8u -> %u (bytes) address 0x%08X -> 0x%08X @ %s:%u\n", oldinfo->byte, byte, ptrn, (void*)(newinfo+1), file, line);
/* new data */
if (!newinfo) {
util_memory_d(oldinfo+1, line, file);
return NULL;
}
newinfo->line = line;
newinfo->byte = byte;
newinfo->file = file;
newinfo->next = oldinfo->next;
newinfo->prev = oldinfo->prev;
if (mem_start == oldinfo)
mem_start = newinfo;
/* copy old */
memcpy(newinfo+1, oldinfo+1, oldinfo->byte);
/* drop old */
mem_db += newinfo->byte;
mem_db -= oldinfo->byte;
free(oldinfo);
/* update */
return newinfo+1;
}
void util_meminfo() {