diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 143d7c7cd2..e2b71cd6b2 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,12 @@ 2008-12-31 13:59 UTC+0100 Foo Bar */ + +2008-05-05 11:31 UTC+0100 Miguel Angel Marchuet Frutos + * include/hbmemory.ch + * source/vm/fm.c + + Added Memory( HB_MEM_BLOCKS ) + 2008-05-02 10:17 UTC+0100 Viktor Szakats (harbour.01 syenar hu) * contrib/rddads/make_b32.bat * contrib/rddads/make_vc.bat diff --git a/harbour/include/hbmemory.ch b/harbour/include/hbmemory.ch index 89d6a38c3b..f1a2b883d7 100644 --- a/harbour/include/hbmemory.ch +++ b/harbour/include/hbmemory.ch @@ -77,6 +77,7 @@ #define HB_MEM_STACKITEMS 1003 /* Total items on the stack */ #define HB_MEM_STACK 1004 /* Total memory size used by the stack (bytes) */ #define HB_MEM_STACK_TOP 1005 /* Total items currently on the stack */ +#define HB_MEM_BLOCKS 1007 /* Total number of memory blcoks allocated */ #endif /* HB_MEMORY_CH_ */ diff --git a/harbour/source/vm/fm.c b/harbour/source/vm/fm.c index bd0325b02a..f7136e4a07 100644 --- a/harbour/source/vm/fm.c +++ b/harbour/source/vm/fm.c @@ -898,6 +898,14 @@ ULONG hb_xquery( USHORT uiMode ) #endif break; + case HB_MEM_BLOCKS: /* Harbour extension (Memory blocks used) */ +#ifdef HB_FM_STATISTICS + ulResult = s_lMemoryBlocks; +#else + ulResult = 0; +#endif + break; + case HB_MEM_USEDMAX: /* Harbour extension (Maximum memory used [bytes]) */ #ifdef HB_FM_STATISTICS ulResult = s_lMemoryMaxConsumed;