--- parser3/src/include/pa_memory.h 2003/03/24 10:21:28 1.1.2.9.2.10 +++ parser3/src/include/pa_memory.h 2020/12/15 17:10:31 1.41 @@ -1,7 +1,7 @@ /** @file Parser: memory reference counting classes decls. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2020 Art. Lebedev Studio (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ @@ -9,21 +9,18 @@ #ifndef PA_MEMORY_H #define PA_MEMORY_H -static const char* IDENT_MEMORY_H="$Date: 2003/03/24 10:21:28 $"; - -#define PA_DEBUG_REFERENCES +#define IDENT_PA_MEMORY_H "$Id: pa_memory.h,v 1.41 2020/12/15 17:10:31 moko Exp $" // include #include "pa_config_includes.h" -#include "gc.h" +#include +// define destructors use for Array, Hash and VMethodFrame +#define USE_DESTRUCTORS -#ifdef XML -# include "gdome.h" -// for xmlChar -# include "libxml/tree.h" -#endif +// std::basic_stringstream used in ^table.csv-string[] is compatible with delete usage check only under Debian 9/10, FreeBSD 12 +// #define CHECK_DELETE_USAGE // forwards @@ -44,23 +41,20 @@ inline void *pa_malloc_atomic(size_t siz 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); - if(!length) - abort(); +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=length+1; + size_t size=known_length+1; if(char *result=static_cast(GC_MALLOC_ATOMIC(size))) { - memcpy(result, auto_variable_never_null, length); - result[length]=0; + memcpy(result, auto_variable_never_null, known_length); + result[known_length]=0; return result; } return static_cast(pa_fail_alloc("allocate clean", size)); } -char* pa_format_integer(int value); inline void pa_free(void *ptr) { GC_FREE(ptr); @@ -73,57 +67,36 @@ inline void *pa_realloc(void *ptr, size_ 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 delete (void *ptr) { abort(); } // disabled -inline void *operator new[] (size_t size) { abort(); } // disabled -//}@ - -#define UseGC ((int)1) -#define PointerFreeGC (true) - -inline void *operator new[] (size_t size, int) { // UseGC - return pa_malloc(size); -} -inline void *operator new[] (size_t size, bool) { // PointerFreeGC - return pa_malloc_atomic(size); -} -inline void operator delete[] (void *ptr) { - pa_free(ptr); -} - /// memory allocation/dallocation goes via pa_malloc/pa_free. class PA_Allocated { public: /// the sole: instances allocated using our functions - static void *operator new(size_t size) { + static void *operator new(size_t size) { return pa_malloc(size); } static void operator delete(void *ptr) { pa_free(ptr); } - static void *malloc(size_t size) { + static void *operator new[](size_t size) { return pa_malloc(size); } - 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 void free(void *ptr) { + static void operator delete[](void *ptr) { pa_free(ptr); } - static void *realloc(void *ptr, size_t size) { - return pa_realloc(ptr, size); - } +}; -private: // disabled from accidental use +// new(PointerFreeGC)/new(PointerGC) should be used to allocate types not inherited from PA_Allocated - /// use malloc/malloc_atomic instead [GC clears result of those] - static void *calloc(size_t size); +#define PointerFreeGC (true) +#define PointerGC (false) -}; +inline void *operator new[] (size_t size, bool pointer_free) { + return pointer_free ? pa_malloc_atomic(size) : pa_malloc(size); +} + +inline void *operator new (size_t size, bool pointer_free) { + return pointer_free ? pa_malloc_atomic(size) : pa_malloc(size); +} /// Base for all Parser classes typedef PA_Allocated PA_Object; @@ -133,5 +106,50 @@ typedef PA_Allocated PA_Object; #define override #define rethrow throw +#if defined(_MSC_VER) || (__cplusplus>=201103L) +#define PA_THROW(what) +#else +#define PA_THROW(what) throw(what) +#endif + +#if !defined(_MSC_VER) && !defined(FREEBSD1X) +// regular new/delete are disabled from accidental use +// no checks for FreeBSD1X.X due to https://bugs.llvm.org/show_bug.cgi?id=40161 bug + +void *new_disabled(); +void delete_disabled(); + +inline void *operator new[] (std::size_t) PA_THROW(std::bad_alloc){ return new_disabled(); } +inline void operator delete[](void *) throw(){ delete_disabled(); } +inline void operator delete[](void *, std::size_t) throw(){ delete_disabled(); } + +inline void *operator new(std::size_t) PA_THROW(std::bad_alloc){ return new_disabled(); } +#ifdef CHECK_DELETE_USAGE +inline void operator delete(void *) throw(){ delete_disabled(); } +#endif + +#ifndef PA_DEBUG_DISABLE_GC +// other regular allocators as disabled from accidental use as well + +void *calloc_disabled(); +void *malloc_disabled(); +void *realloc_disabled(); +void free_disabled(); +char *strdup_disabled(); + +inline void *calloc(size_t) { return calloc_disabled(); } +inline void *malloc(size_t) { return malloc_disabled(); } +inline void *realloc(void *, size_t) { return realloc_disabled(); } +inline void free(void *) { free_disabled(); } +inline char *strdup(const char*, size_t){ return strdup_disabled(); } +#endif // PA_DEBUG_DISABLE_GC + +#endif // _MSC_VER + +#ifdef PA_DEBUG_DISABLE_GC +#define PA_GC_GCOLLECT +#else +#define PA_GC_GCOLLECT { GC_enable(); GC_gcollect(); GC_disable(); } +#endif #endif