parser3/src/include/pa_memory.h - diff

Return to pa_memory.h CVS log

Up to [parser3project] / parser3 / src / include

Diff for /parser3/src/include/pa_memory.h between versions 1.1.2.9.2.8 and 1.2

version 1.1.2.9.2.8, 2003/03/21 13:42:29	version 1.2, 2003/07/24 11:31:21
Line 11	Line 11

static const char* IDENT_MEMORY_H="$Date$";	static const char* IDENT_MEMORY_H="$Date$";

#define PA_DEBUG_REFERENCES

// include	// include

#include "pa_config_includes.h"	#include "pa_config_includes.h"

#include "gc.h"	#include "gc.h"


Line 25 static const char* IDENT_MEMORY_H="$Date	Line 24 static const char* IDENT_MEMORY_H="$Date
# include "libxml/tree.h"	# include "libxml/tree.h"
#endif	#endif

	// defines

	//#define PA_DEBUG_GC_MEMORY

	#ifdef PA_DEBUG_GC_MEMORY
	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


// forwards	// forwards

void pa_fail_alloc(const char what, size_t size);	void pa_fail_alloc(const char what, size_t size);
Line 32 void pa_fail_alloc(const char what, si	Line 58 void pa_fail_alloc(const char what, si
// inlines	// inlines

inline void *pa_malloc(size_t size) {	inline void *pa_malloc(size_t size) {
if(void *result=GC_MALLOC(size))	if(void *result=PA_GC_MALLOC(size))
return result;	return result;

return pa_fail_alloc("allocate", size);	return pa_fail_alloc("allocate", size);
}	}

inline void *pa_malloc_atomic(size_t size) {	inline void *pa_malloc_atomic(size_t size) {
if(void *result=GC_MALLOC_ATOMIC(size))	if(void *result=PA_GC_MALLOC_ATOMIC(size))
return result;	return result;

return pa_fail_alloc("allocate clean", size);	return pa_fail_alloc("allocate clean", size);
}	}
/// @a length may be null, which mean "autocalc it"	/// @a length may be null, which mean "autocalc it"
inline char pa_strdup(const char auto_variable_never_null, size_t length=0) {	inline char pa_strdup(const char auto_variable_never_null, size_t helper_length=0) {
if(!length)	size_t known_length=(helper_length?helper_length:strlen(auto_variable_never_null));
length=strlen(auto_variable_never_null);
if(!length)	size_t size=known_length+1;
abort();	if(char result=static_cast<char>(PA_GC_MALLOC_ATOMIC(size))) {
	memcpy(result, auto_variable_never_null, size);
size_t size=length+1;	result[known_length]=0;
if(char result=static_cast<char>(GC_MALLOC_ATOMIC(size))) {
memcpy(result, auto_variable_never_null, length);
result[length]=0;
return result;	return result;
}	}

return static_cast<char*>(pa_fail_alloc("allocate clean", size));	return static_cast<char*>(pa_fail_alloc("allocate clean", size));
}	}

inline void pa_free(void *ptr) {	inline void pa_free(void *ptr) {
GC_FREE(ptr);	PA_GC_FREE(ptr);
}	}

inline void pa_realloc(void ptr, size_t size) {	inline void pa_realloc(void ptr, size_t size) {
if(void *result=GC_REALLOC(ptr, size))	if(void *result=PA_GC_REALLOC(ptr, size))
return result;	return result;

return pa_fail_alloc("reallocate to", size);	return pa_fail_alloc("reallocate to", size);
Line 73 inline void pa_realloc(void ptr, size_	Line 97 inline void pa_realloc(void ptr, size_

//{@ these operators are disabled, one should explicitely specify either new(UseGC) or new(PointerFreeGC)	//{@ 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 delete (void *ptr) { abort(); } // disabled
inline void *operator new[] (size_t size) { abort(); } // disabled	inline void *operator new[] (size_t size) { abort(); } // disabled
//}@	//}@

#define UseGC ((int)1)	#define UseGC ((int)1)
#define PointerFreeGC (true)	#define PointerFreeGC (true)

inline void *operator new[] (size_t size, int) { // UseGC	//{@ Array-oriented
	inline void *operator new[] (size_t size, int mode) { // UseGC
return pa_malloc(size);	return pa_malloc(size);
}	}
inline void *operator new[] (size_t size, bool) { // PointerFreeGC	inline void *operator new[] (size_t size, bool) { // PointerFreeGC
Line 89 inline void *operator new[] (size_t size	Line 113 inline void *operator new[] (size_t size
inline void operator delete[] (void *ptr) {	inline void operator delete[] (void *ptr) {
pa_free(ptr);	pa_free(ptr);
}	}
	//}@

	//{@ Structure-oriented
	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.	/// memory allocation/dallocation goes via pa_malloc/pa_free.
class PA_Allocated {	class PA_Allocated {
Line 106 public:	Line 143 public:
static void *malloc_atomic(size_t size) {	static void *malloc_atomic(size_t size) {
return pa_malloc_atomic(size);	return pa_malloc_atomic(size);
}	}
static char strdup(const char auto_variable_never_null, size_t length=0) {	static char strdup(const char auto_variable_never_null, size_t helper_length=0) {
return pa_strdup(auto_variable_never_null, length);	return pa_strdup(auto_variable_never_null, helper_length);
}	}
static void free(void *ptr) {	static void free(void *ptr) {
pa_free(ptr);	pa_free(ptr);
Line 118 public:	Line 155 public:

private: // disabled from accidental use	private: // disabled from accidental use

/// use malloc instead [GC clears malloc result]	/// use malloc/malloc_atomic instead [GC clears result of those]
static void *calloc(size_t size);	static void *calloc(size_t size);

};	};

	/// Those who want their destructor called during finalization, must derive from this class [also]
	class PA_Cleaned {
	#ifndef PA_DEBUG_DISABLE_GC
	static void cleanup( void* obj, void* displ ) {
	((PA_Cleaned) ((char) obj + (ptrdiff_t) displ))->~PA_Cleaned();
	}

	public:
	PA_Cleaned() {
	GC_finalization_proc oldProc;
	void* oldData;
	void* base = GC_base( (void *) this );
	if (0 != base) {
	// Don't call the debug version, since this is a real base address.
	GC_register_finalizer_ignore_self(
	base, (GC_finalization_proc)cleanup, (void) ((char) this - (char*) base),
	&oldProc, &oldData );
	if (0 != oldProc) {
	GC_register_finalizer_ignore_self( base, oldProc, oldData, 0, 0 );
	}
	}
	}

	virtual ~PA_Cleaned() {
	GC_REGISTER_FINALIZER_IGNORE_SELF( GC_base(this), 0, 0, 0, 0 );
	}
	#endif
	};

/// Base for all Parser classes	/// Base for all Parser classes
typedef PA_Allocated PA_Object;	typedef PA_Allocated PA_Object;

Line 131 typedef PA_Allocated PA_Object;	Line 197 typedef PA_Allocated PA_Object;
#define override	#define override
#define rethrow throw	#define rethrow throw


#endif	#endif

E-mail:

Removed from v.1.1.2.9.2.8
changed lines
	Added in v.1.2