Mon Oct 6 15:38:40 CEST 2003 Paolo Molaro <lupus@ximian.com>

	* gc.c: report heap_size - free_bytes as total memory allocated
	(bug#49362).

svn path=/trunk/mono/; revision=18671

diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index c413f0907e47d5d81aa786def10e817ba5f72182..b6f441073392e0be224219fe2500529ccac198ae 100644 (file)
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,9 @@
+
+Mon Oct 6 15:38:40 CEST 2003 Paolo Molaro <lupus@ximian.com>
+
+       * gc.c: report heap_size - free_bytes as total memory allocated
+       (bug#49362).
+
 2003-10-05  Zoltan Varga  <vargaz@freemail.hu>
 
        * icall.c (ves_icall_System_CurrentTimeZone_GetTimeZoneData): Finally 

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
index 1ba536622ea83e79c814c4336913b2d2cdcd010b..3dbab88e47b59be9a1c06a5a0c5871d36fe0d556 100644 (file)
--- a/mono/metadata/gc.c
+++ b/mono/metadata/gc.c
@@ -213,7 +213,7 @@ ves_icall_System_GC_GetTotalMemory (MonoBoolean forceCollection)
 #if HAVE_BOEHM_GC
        if (forceCollection)
                GC_gcollect ();
-       return GC_get_heap_size ();
+       return GC_get_heap_size () - GC_get_free_bytes ();
 #else
        return 0;
 #endif