Merged revisions 7501-7598 via svnmerge from

[cacao.git] / src / vmcore / statistics.c

diff --git a/src/vmcore/statistics.c b/src/vmcore/statistics.c
index 8cf56b9f8ea13752c3d4a11a5f48427b0b27de7e..9d6a67b32ca4fad35c9439f3ac1b401b055f7f32 100644 (file)
--- a/src/vmcore/statistics.c
+++ b/src/vmcore/statistics.c
@@ -22,7 +22,7 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: statistics.c 7483 2007-03-08 13:17:40Z michi $
+   $Id: statistics.c 7551 2007-03-21 14:26:09Z twisti $
 
 */
 
@@ -76,13 +76,20 @@ s4 globaluseddumpsize = 0;
 
 /* variables for measurements *************************************************/
 
-s4 size_classinfo  = 0;
-s4 size_fieldinfo  = 0;
-s4 size_methodinfo = 0;
-s4 size_lineinfo   = 0;
-s4 size_codeinfo   = 0;
+s4 size_classinfo        = 0;
+s4 size_fieldinfo        = 0;
+s4 size_methodinfo       = 0;
+s4 size_lineinfo         = 0;
+s4 size_codeinfo         = 0;
 
-s4 size_stack_map  = 0;
+s4 size_stack_map        = 0;
+s4 size_string           = 0;
+
+s4 size_threadobject     = 0;
+
+s4 size_lock_record_pool = 0;
+s4 size_lock_hashtable   = 0;
+s4 size_lock_waiter      = 0;
 
 int count_const_pool_len = 0;
 int count_classref_len = 0;
@@ -630,7 +637,12 @@ void statistics_print_memory_usage(void)
        printf("utf:                    %10d\n", count_utf_len);
        printf("vmcode:                 %10d\n", count_vmcode_len);
        printf("exception tables:       %10d\n", count_extable_len);
-    printf("stack map:              %10d\n", size_stack_map);
+       printf("stack map:              %10d\n", size_stack_map);
+       printf("string:                 %10d\n", size_string);
+       printf("threadobject:           %10d\n", size_threadobject);
+       printf("lock record pool:       %10d\n", size_lock_record_pool);
+       printf("lock hashtable:         %10d\n", size_lock_hashtable);
+       printf("lock waiter:            %10d\n", size_lock_waiter);
        printf("                         ----------\n");
 
        sum =
@@ -643,7 +655,12 @@ void statistics_print_memory_usage(void)
                count_utf_len +
                count_vmcode_len +
                count_extable_len +
-               size_stack_map;
+               size_stack_map +
+               size_string +
+               size_threadobject +
+               size_lock_record_pool +
+               size_lock_hashtable +
+               size_lock_waiter;
 
        printf("                        %10d\n", sum);
        printf("\n");