--- parser3/src/include/pa_memory.h 2003/04/01 15:42:26 1.1.2.9.2.17 +++ parser3/src/include/pa_memory.h 2003/09/22 14:56:19 1.5 @@ -9,12 +9,14 @@ #ifndef PA_MEMORY_H #define PA_MEMORY_H -static const char* IDENT_MEMORY_H="$Date: 2003/04/01 15:42:26 $"; +static const char* IDENT_MEMORY_H="$Date: 2003/09/22 14:56:19 $"; // include #include "pa_config_includes.h" +/// to debug backtrace pointers switch this on: +//#define GC_DEBUG #include "gc.h" @@ -33,21 +35,11 @@ void* pa_gc_malloc(size_t size); void* pa_gc_malloc_atomic(size_t size); void* pa_gc_realloc(void* ptr, size_t size); void pa_gc_free(void* ptr); - -# define PA_GC_MALLOC(size) pa_gc_malloc(size) -# define PA_GC_MALLOC_ATOMIC(size) pa_gc_malloc_atomic(size) -# define PA_GC_REALLOC(ptr,size) pa_gc_realloc(ptr,size) -# define PA_GC_FREE(ptr) pa_gc_free(ptr) #else inline void* pa_gc_malloc(size_t size) { return GC_MALLOC(size); } inline void* pa_gc_malloc_atomic(size_t size) { return GC_MALLOC_ATOMIC(size); } inline void* pa_gc_realloc(void* ptr, size_t size) { return GC_REALLOC(ptr, size); } inline void pa_gc_free(void* ptr) { GC_FREE(ptr); } - -# define PA_GC_MALLOC(size) pa_gc_malloc(size) -# define PA_GC_MALLOC_ATOMIC(size) pa_gc_malloc_atomic(size) -# define PA_GC_REALLOC(ptr,size) pa_gc_realloc(ptr,size) -# define PA_GC_FREE(ptr) pa_gc_free(ptr) #endif @@ -58,27 +50,26 @@ void *pa_fail_alloc(const char* what, si // inlines inline void *pa_malloc(size_t size) { - if(void *result=PA_GC_MALLOC(size)) + if(void *result=pa_gc_malloc(size)) return result; return pa_fail_alloc("allocate", size); } inline void *pa_malloc_atomic(size_t size) { - if(void *result=PA_GC_MALLOC_ATOMIC(size)) + if(void *result=pa_gc_malloc_atomic(size)) return result; return pa_fail_alloc("allocate clean", size); } /// @a length may be null, which mean "autocalc it" -inline char *pa_strdup(const char* auto_variable_never_null, size_t length=0) { - if(!length) - length=strlen(auto_variable_never_null); - - size_t size=length+1; - if(char *result=static_cast(PA_GC_MALLOC_ATOMIC(size))) { - memcpy(result, auto_variable_never_null, length); - result[length]=0; +inline char *pa_strdup(const char* auto_variable_never_null, size_t helper_length=0) { + size_t known_length=(helper_length?helper_length:strlen(auto_variable_never_null)); + + size_t size=known_length+1; + if(char *result=static_cast(pa_gc_malloc_atomic(size))) { + memcpy(result, auto_variable_never_null, size); + result[known_length]=0; return result; } @@ -86,26 +77,26 @@ inline char *pa_strdup(const char* auto_ } inline void pa_free(void *ptr) { - PA_GC_FREE(ptr); + pa_gc_free(ptr); } inline void *pa_realloc(void *ptr, size_t size) { - if(void *result=PA_GC_REALLOC(ptr, size)) + if(void *result=pa_gc_realloc(ptr, size)) return result; return pa_fail_alloc("reallocate to", size); } //{@ these operators are disabled, one should explicitely specify either new(UseGC) or new(PointerFreeGC) -inline void *operator new(size_t size) { abort(); } // disabled -inline void *operator new[] (size_t size) { abort(); } // disabled +inline void *operator new(size_t) { abort(); } // disabled +inline void *operator new[] (size_t) { abort(); } // disabled //}@ #define UseGC ((int)1) #define PointerFreeGC (true) //{@ Array-oriented -inline void *operator new[] (size_t size, int mode) { // UseGC +inline void *operator new[] (size_t size, int) { // UseGC return pa_malloc(size); } inline void *operator new[] (size_t size, bool) { // PointerFreeGC @@ -144,8 +135,8 @@ public: static void *malloc_atomic(size_t size) { return pa_malloc_atomic(size); } - static char *strdup(const char* auto_variable_never_null, size_t length=0) { - return pa_strdup(auto_variable_never_null, length); + static char *strdup(const char* auto_variable_never_null, size_t helper_length=0) { + return pa_strdup(auto_variable_never_null, helper_length); } static void free(void *ptr) { pa_free(ptr);