Changeset 254 for trunk/thune/gc.c

Timestamp:

08/23/06 20:34:11 (2 years ago)

Author:

krobillard

Message:

Thune - GC report now shows number of bytes used & wasted.

Files:

• trunk/thune/gc.c (modified) (2 diffs)

trunk/thune/gc.c

@@ -436 +436 @@
 void ur_gcReport( UrlanEnv* env )
 {
-    dprint( "  Array    Buf       Max Used  Free\n" );
-    dprint( "  ---------------------------------\n" );
-    dprint( "  Blocks   %p   %4d   %4d\n", env->blocks.arr.ptr.v,
-                                           env->blocks.arr.used,
-                                           env->blocks.freeCount );
-    dprint( "  Binaries %p   %4d   %4d\n", env->bin.arr.ptr.v,
-                                           env->bin.arr.used,
-                                           env->bin.freeCount );
+    int used;
+    int unused;
+
+    dprint( "  Array    Buf       Max Used  Free    Bytes  Bytes Wasted\n" );
+    dprint( "  --------------------------------------------------------\n" );
+    {
+        UBinary* it  = (UBinary*) env->bin.arr.ptr.v;
+        UBinary* end = it + env->bin.arr.used;
+
+        used = 0;
+        unused = 0;
+        while( it != end )
+        {
+            if( it->avail > 0 )
+            {
+                used   += it->used;
+                unused += it->avail - it->used;
+            }
+            ++it;
+        }
+        dprint( "  Binaries %p   %4d   %4d   %7d   %7d\n",
+                env->bin.arr.ptr.v,
+                env->bin.arr.used,
+                env->bin.freeCount,
+                used, unused );
+    }
+    {
+        UBlock* it  = (UBlock*) env->blocks.arr.ptr.v;
+        UBlock* end = it + env->blocks.arr.used;
+
+        used = 0;
+        unused = 0;
+        while( it != end )
+        {
+            if( it->avail > 0 )
+            {
+                used   += it->used;
+                unused += it->avail - it->used;
+            }
+            ++it;
+        }
+        dprint( "  Blocks   %p   %4d   %4d   %7d   %7d\n",
+                env->blocks.arr.ptr.v,
+                env->blocks.arr.used,
+                env->blocks.freeCount,
+                used * 16, unused * 16 );
+    }
     dprint( "\n" );
 }
@@ -609 +648 @@
 #ifdef GC_REPORT
     dprint( "  %d passes\n\n", pass );
-    ur_gcReport();
+    ur_gcReport( env );
 #endif
 }