-//////////////////////////////////////////////////////////////////////////////
//
-//////////////////////////////////////////////////////////////////////////////
+// Memory handler
//
+// by David Raingeard (Cal2)
+// GCC/SDL port by Niels Wagenaar (Linux/WIN32) and Caz (BeOS)
+// Cleanups by James L. Hammons
//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-#include "include/memory.h"
+#include "memory.h"
+
+#include <malloc.h>
+#include <stdlib.h>
+#include "log.h"
+
+#warning This module needs some serious cleanup. !!! FIX !!!
+
+// Useful structs (for doubly linked list in this case)
typedef struct sMemBlockInfo
{
- void *ptr;
- char *info;
- UINT32 size;
- struct sMemBlockInfo *next;
- struct sMemBlockInfo *prev;
+ void * ptr;
+ const char * info;
+ uint32 size;
+ sMemBlockInfo * next;
+ sMemBlockInfo * prev;
} sMemBlockInfo;
-sMemBlockInfo memoryInfo;
-UINT32 memoryMaxAllocated;
-UINT32 currentAllocatedMemory;
-UINT32 maximumAllocatedMemory;
+// Private global variables
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void memory_addMemInfo(void *ptr, UINT32 size, char *info)
+static sMemBlockInfo memoryInfo;
+//static uint32 memoryMaxAllocated;
+static uint32 currentAllocatedMemory;
+static uint32 maximumAllocatedMemory;
+
+
+void memory_addMemInfo(void * ptr, uint32 size, const char * info)
{
- sMemBlockInfo *alias;
+ sMemBlockInfo * alias = &memoryInfo;
+
+ while (alias->next)
+ alias = alias->next;
+
+ alias->next = (sMemBlockInfo *)malloc(sizeof(sMemBlockInfo));
- alias=&memoryInfo;
- while (alias->next) alias=alias->next;
- alias->next=(sMemBlockInfo*)malloc(sizeof(sMemBlockInfo));
- if (alias->next==NULL)
- {
+ if (alias->next == NULL)
+ {
exit(0);
- return;
- }
- alias->next->prev=alias;
- alias=alias->next;
- alias->next=NULL;
- alias->size=size;
- alias->ptr=ptr;
- alias->info=info;
+ return;
+ }
+
+ alias->next->prev = alias;
+ alias = alias->next;
+ alias->next = NULL;
+ alias->size = size;
+ alias->ptr = ptr;
+ alias->info = info;
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void memory_init(void)
+
+void MemoryInit(void)
{
- memoryInfo.next=NULL;
- memoryInfo.prev=NULL;
- currentAllocatedMemory=0;
- maximumAllocatedMemory=0;
+ memoryInfo.next = memoryInfo.prev = NULL;
+ currentAllocatedMemory = maximumAllocatedMemory = 0;
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void *memory_malloc(UINT32 size, char *info)
+
+void MemoryDone(void)
{
- void *ptr;
-
- ptr=(void*)malloc(size);
- if (ptr==NULL)
- {
- return(NULL);
- }
- memory_addMemInfo(ptr,size,info);
- currentAllocatedMemory+=size;
- if (currentAllocatedMemory>maximumAllocatedMemory)
- maximumAllocatedMemory=currentAllocatedMemory;
- return(ptr);
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void memory_malloc_secure(void **new_ptr, UINT32 size, char *info)
+
+void * memory_malloc(uint32 size, const char * info)
{
- void *ptr;
+ void * ptr = (void *)malloc(size);
+
+ if (ptr == NULL)
+ return NULL;
+
+ memory_addMemInfo(ptr, size, info);
+ currentAllocatedMemory += size;
+
+ if (currentAllocatedMemory > maximumAllocatedMemory)
+ maximumAllocatedMemory = currentAllocatedMemory;
+
+ return ptr;
+}
+
+// OK, this sux, causes the compiler to complain about type punned pointers.
+// The only difference between this and the previous is that this one ABORTS
+// if it can't allocate the memory. BAD BAD BAD
+
+void memory_malloc_secure(void ** new_ptr, uint32 size, const char * info)
+{
+ WriteLog("Memory: Allocating %i bytes of memory for <%s>...", size, (info == NULL ? "unknown" : info));
+
+ void * ptr = malloc(size);
+
+ if (ptr == NULL)
+ {
+ WriteLog("Failed!\n");
+ LogDone();
+
+#warning BAD, BAD, BAD! Need to do better than this!!!
+#warning And since we ARE keeping track of all memory allocations, we should unwind the stack here as well...!
+#warning !!! FIX !!!
- fprintf(log_get(),"memory: allocating %i bytes of memory for <%s>...",size,(info==NULL)?"unknown":info);
- ptr=(void*)malloc(size);
- if (ptr==NULL)
- {
- fprintf(log_get(),"failed\n");
- log_done();
exit(0);
- }
- memory_addMemInfo(ptr,size,info);
- currentAllocatedMemory+=size;
- if (currentAllocatedMemory>maximumAllocatedMemory)
- maximumAllocatedMemory=currentAllocatedMemory;
- *new_ptr=ptr;
- fprintf(log_get(),"ok\n");
+ }
+
+ memory_addMemInfo(ptr, size, info);
+ currentAllocatedMemory += size;
+
+ if (currentAllocatedMemory > maximumAllocatedMemory)
+ maximumAllocatedMemory = currentAllocatedMemory;
+
+ *new_ptr = ptr;
+ WriteLog("OK\n");
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void memory_memoryUsage(FILE *fp)
+
+/*
+void * memory_malloc_secure2(uint32 size, const char * info)
{
- sMemBlockInfo *alias;
- UINT32 total=0;
-
- fprintf(fp,"Memory usage:\n");
- alias=&memoryInfo;
- alias=alias->next;
- while (alias)
- {
- fprintf(fp,"\t%16i bytes : <%s> (@ 0x%.8x)\n",alias->size,alias->info,alias->ptr);
- total+=alias->size;
- alias=alias->next;
- }
- fprintf(fp,"\n\t%16i bytes total(%i Mb)\n",total,(total>>20));
- fprintf(fp,"\n\t%16i bytes memory peak(%i Mb)\n",maximumAllocatedMemory,maximumAllocatedMemory>>20);
+ WriteLog("Memory: Allocating %i bytes of memory for <%s>...", size, (info == NULL ? "unknown" : info));
+
+ void * ptr = malloc(size);
+
+ if (ptr == NULL)
+ {
+ WriteLog("Failed!\n");
+ log_done();
+
+//BAD, BAD, BAD! Need to do better than this!!!
+//And since we ARE keeping track of all memory allocations, we should unwind the stack here as well...!
+// !!! FIX !!!
+
+ exit(0);
+ }
+
+ memory_addMemInfo(ptr, size, info);
+ currentAllocatedMemory += size;
+
+ if (currentAllocatedMemory > maximumAllocatedMemory)
+ maximumAllocatedMemory = currentAllocatedMemory;
+
+ new_ptr = ptr;
+ WriteLog("OK\n");
}
+*/
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void memory_done(void)
+void memory_free(void * ptr)
{
+// sMemBlockInfo * alias= &memoryInfo;
+// alias = alias->next;
+ sMemBlockInfo * alias= memoryInfo.next;
+
+ while (alias->ptr != ptr)
+ alias = alias->next;
+
+ WriteLog("Memory: Freeing %i bytes from <%s>...\n", (int)alias->size, alias->info);
+
+ free(ptr);
+ currentAllocatedMemory -= alias->size;
+ alias->prev->next = alias->next;
+
+ if (alias->next != NULL)
+ alias->next->prev = alias->prev;
+
+ free(alias);
}
-//////////////////////////////////////////////////////////////////////////////
-//
-//////////////////////////////////////////////////////////////////////////////
-//
-//
-//
-//////////////////////////////////////////////////////////////////////////////
-void memory_free(void *ptr)
+
+void memory_memoryUsage(FILE * fp)
{
- sMemBlockInfo *alias;
-
- alias=&memoryInfo;
- alias=alias->next;
- while (alias->ptr!=ptr)
- alias=alias->next;
- free(ptr);
- currentAllocatedMemory-=alias->size;
- alias->prev->next=alias->next;
- if (alias->next!=NULL)
- alias->next->prev=alias->prev;
- free(alias);
+ uint32 total = 0;
+
+ fprintf(fp, "Memory usage:\n");
+
+// sMemBlockInfo * alias = &memoryInfo;
+// alias = alias->next;
+ sMemBlockInfo * alias= memoryInfo.next;
+
+ while (alias)
+ {
+// fprintf(fp, "\t%16i bytes: <%s> (@ %08X)\n", (int)alias->size, alias->info, (unsigned int)alias->ptr);
+ fprintf(fp, "\t%16i bytes: <%s> (@ %08X)\n", (int)alias->size, alias->info, alias->ptr);
+ total += alias->size;
+ alias = alias->next;
+ }
+
+ fprintf(fp, "\n\t%16i bytes total(%i Mb)\n", (int)total, (int)(total >> 20));
+ fprintf(fp, "\n\t%16i bytes memory peak(%i Mb)\n", (int)maximumAllocatedMemory, (int)(maximumAllocatedMemory >> 20));
}
projects / virtualjaguar / blobdiff