--- parser3/src/main/pa_memory.C 2003/02/26 11:51:15 1.1.2.3 +++ parser3/src/main/pa_memory.C 2003/03/27 15:33:45 1.1.2.5.2.7 @@ -5,55 +5,24 @@ Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char* IDENT_MEMORY_C="$Date: 2003/02/26 11:51:15 $"; +static const char* IDENT_MEMORY_C="$Date: 2003/03/27 15:33:45 $"; -#include "pa_pool.h" -#include "pa_exception.h" -#include "pa_common.h" #include "pa_sapi.h" +#include "pa_common.h" -void *pa_fail_alloc(char *what, size_t size) { - SAPI::abort("out of memory: failed to %s %u bytes", - what, size); - +void *pa_fail_alloc(const char* what, size_t size) { +#ifdef PA_DEBUG_DISABLE_GC + SAPI::abort("xx"); +#else + SAPI::abort("out of memory: failed to %s %u bytes. " + "heap_used=%lu, heap_free=%lu, bytes_since_gc=%lu, total_bytes=%lu", + what, size, + GC_get_heap_size(), + GC_get_free_bytes(), + GC_get_bytes_since_gc(), + GC_get_total_bytes() + ); +#endif // never reached return 0; } - -/* -#ifdef XML - -const char* Pool::transcode_cstr(xmlChar *s) { - return get_source_charset().transcode_cstr(s); -} - -String& Pool::transcode(xmlChar *s -#ifndef NO_STRING_ORIGIN - , const String *origin -#endif - ) { - return get_source_charset().transcode(s, origin); -} - -const char* Pool::transcode_cstr(GdomeDOMString *s) { - return get_source_charset().transcode_cstr(s); -} - -String& Pool::transcode(GdomeDOMString *s -#ifndef NO_STRING_ORIGIN - , const String *origin -#endif - ) { - return get_source_charset().transcode(s, origin); -} - -xmlChar *Pool::transcode_buf2xchar(const char* buf, size_t buf_size) { - return get_source_charset().transcode_buf2xchar(buf, buf_size); -} - -GdomeDOMString_auto_ptr Pool::transcode(const String& s) { - return get_source_charset().transcode(s); -} - -#endif -*/