philippelh/bitchx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve memory allocation routines to fix alignment and remove non-standard

Browse Source 
void * arithmetic.

Fixes compilation on Irix.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@109 13b04d17-f746-0410-82c6-800466cd88b0
This commit is contained in:
Kevin Easton
2011-02-02 12:15:29 +00:00
parent 08cca81993
commit b43ecbaa85
1 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
source/ircaux.c
View File

@@ -44,11 +44,21 @@ CVS_REVISION(ircaux_c)
#include <dmalloc.h> #include <dmalloc.h>
#endif #endif
#define alloc_start(ptr) ((ptr) - sizeof(void *)) /* This union is used to ensure that the resulting address
#define alloc_size(ptr) (*(int *)( alloc_start((ptr)) )) * will be aligned correctly for all types we use. */
union alloc_info {
size_t size;
void *dummy1;
long dummy2;
double dummy3;
};
#define alloc_start(ptr) ((void *)((char *)(ptr) - sizeof(union alloc_info)))
#define alloc_size(ptr) (((union alloc_info *)alloc_start(ptr))->size)
#define FREE_DEBUG 1 #define FREE_DEBUG 1
#define FREED_VAL -3 #define FREED_VAL (size_t)-3
#define ALLOC_MAGIC 0xafbdce70 #define ALLOC_MAGIC 0xafbdce70
char compress_buffer[10000]; char compress_buffer[10000];
@@ -71,13 +81,22 @@ void start_memdebug(void)
*/ */
void * n_malloc (size_t size, const char *module, const char *file, const int line) void * n_malloc (size_t size, const char *module, const char *file, const int line)
{ {
char *ptr; char *ptr;
if (size < FREED_VAL - sizeof(union alloc_info))
{
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
if (!(ptr = (char *)_calloc_leap(file, line, 1, size+sizeof(void *)))) ptr = _calloc_leap(file, line, 1, size + sizeof(union alloc_info));
#else #else
if (!(ptr = (char *)calloc(1, size+sizeof(void *)+sizeof(void *)))) ptr = calloc(1, size + sizeof(union alloc_info));
#endif #endif
}
else
{
ptr = NULL;
}
if (!ptr)
{ {
yell("Malloc() failed, giving up!"); yell("Malloc() failed, giving up!");
putlog(LOG_ALL, "*", "*** failed calloc %s %s (%d)", module?module:empty_string, file, line); putlog(LOG_ALL, "*", "*** failed calloc %s %s (%d)", module?module:empty_string, file, line);
@@ -85,7 +104,7 @@ void * n_malloc (size_t size, const char *module, const char *file, const int li
exit(1); exit(1);
} }
/* Store the size of the allocation in the buffer. */ /* Store the size of the allocation in the buffer. */
ptr += sizeof(void *); ptr += sizeof(union alloc_info);
alloc_size(ptr) = size; alloc_size(ptr) = size;
return ptr; return ptr;
} }
@@ -110,9 +129,9 @@ void * n_free(void *ptr, const char *module, const char *file, const int line)
alloc_size(ptr) = FREED_VAL; alloc_size(ptr) = FREED_VAL;
#ifdef MEM_DEBUG #ifdef MEM_DEBUG
_free_leap(file, line, (void *)alloc_start(ptr)); _free_leap(file, line, alloc_start(ptr));
#else #else
free((void *)alloc_start(ptr)); free(alloc_start(ptr));
#endif #endif
ptr = NULL; ptr = NULL;
} }