- created jitcache-arm-x86 branch
[cacao.git] / src / vmcore / statistics.c
index 096e49ca173ea6e6fa7776b5b5252fc8d7049ef6..dbffc11731ff9d1618e945ae4ad89bf41f409012 100644 (file)
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   $Id: statistics.c 8112 2007-06-20 17:54:36Z twisti $
-
 */
 
 
 #include "config.h"
 
+#include <stdint.h>
 #include <string.h> 
 
 #if defined(HAVE_TIME_H)
@@ -98,11 +97,20 @@ s4 size_stack_map        = 0;
 s4 size_string           = 0;
 
 s4 size_threadobject     = 0;
+int32_t size_thread_index_t = 0;
+int32_t size_stacksize      = 0;
 
 s4 size_lock_record      = 0;
 s4 size_lock_hashtable   = 0;
 s4 size_lock_waiter      = 0;
 
+int32_t count_linenumbertable = 0;
+int32_t size_linenumbertable  = 0;
+
+s4 size_patchref         = 0;
+
+s4 size_cachedref           = 0;
+
 u8 count_calls_java_to_native = 0;
 u8 count_calls_native_to_java = 0;
 
@@ -656,22 +664,24 @@ void statistics_print_memory_usage(void)
 
        log_println("memory usage ----------------------");
        log_println("");
-       log_println("code:                   %10d", count_code_len);
-       log_println("data:                   %10d", count_data_len);
-       log_println("                         ----------");
+       log_println("code:                      %10d", count_code_len);
+       log_println("data:                      %10d", count_data_len);
+       log_println("                            ----------");
 
        sum =
                count_code_len +
                count_data_len;
 
-       log_println("                        %10d", sum);
+       log_println("                           %10d", sum);
+
        log_println("");
-       log_println("classinfo  (%3d B):     %10d", (int) sizeof(classinfo), size_classinfo);
-       log_println("fieldinfo  (%3d B):     %10d", (int) sizeof(fieldinfo), size_fieldinfo);
-       log_println("methodinfo (%3d B):     %10d", (int) sizeof(methodinfo), size_methodinfo);
-       log_println("lineinfo   (%3d B):     %10d", (int) sizeof(lineinfo), size_lineinfo);
-       log_println("codeinfo   (%3d B):     %10d", (int) sizeof(codeinfo), size_codeinfo);
-       log_println("                         ----------");
+
+       log_println("classinfo  (%3d B):        %10d", (int) sizeof(classinfo), size_classinfo);
+       log_println("fieldinfo  (%3d B):        %10d", (int) sizeof(fieldinfo), size_fieldinfo);
+       log_println("methodinfo (%3d B):        %10d", (int) sizeof(methodinfo), size_methodinfo);
+       log_println("lineinfo   (%3d B):        %10d", (int) sizeof(lineinfo), size_lineinfo);
+       log_println("codeinfo   (%3d B):        %10d", (int) sizeof(codeinfo), size_codeinfo);
+       log_println("                            ----------");
 
        sum =
                size_classinfo +
@@ -680,24 +690,43 @@ void statistics_print_memory_usage(void)
                size_lineinfo +
                size_codeinfo;
 
-       log_println("                        %10d", sum);
+       log_println("                           %10d", sum);
+
        log_println("");
-       log_println("constant pool:          %10d", count_const_pool_len);
-       log_println("classref:               %10d", count_classref_len);
-       log_println("parsed descriptors:     %10d", count_parsed_desc_len);
-       log_println("vftbl:                  %10d", count_vftbl_len);
-       log_println("compiler stubs:         %10d", count_cstub_len);
-       log_println("native stubs:           %10d", size_stub_native);
-       log_println("utf:                    %10d", count_utf_len);
-       log_println("vmcode:                 %10d", count_vmcode_len);
-       log_println("exception tables:       %10d", count_extable_len);
-       log_println("stack map:              %10d", size_stack_map);
-       log_println("string:                 %10d", size_string);
-       log_println("threadobject:           %10d", size_threadobject);
-       log_println("lock record:            %10d", size_lock_record);
-       log_println("lock hashtable:         %10d", size_lock_hashtable);
-       log_println("lock waiter:            %10d", size_lock_waiter);
-       log_println("                         ----------");
+
+       log_println("linenumber tables (%5d): %10d", count_linenumbertable, size_linenumbertable);
+       log_println("exception tables:          %10d", count_extable_len);
+       log_println("patcher references:        %10d", size_patchref);
+       log_println("cached references:         %10d", size_cachedref);
+       log_println("                            ----------");
+
+       sum =
+               size_linenumbertable +
+               count_extable_len +
+               size_patchref +
+               size_cachedref;
+
+       log_println("                           %10d", sum);
+
+       log_println("");
+
+       log_println("constant pool:             %10d", count_const_pool_len);
+       log_println("classref:                  %10d", count_classref_len);
+       log_println("parsed descriptors:        %10d", count_parsed_desc_len);
+       log_println("vftbl:                     %10d", count_vftbl_len);
+       log_println("compiler stubs:            %10d", count_cstub_len);
+       log_println("native stubs:              %10d", size_stub_native);
+       log_println("utf:                       %10d", count_utf_len);
+       log_println("vmcode:                    %10d", count_vmcode_len);
+       log_println("stack map:                 %10d", size_stack_map);
+       log_println("string:                    %10d", size_string);
+       log_println("threadobject:              %10d", size_threadobject);
+       log_println("thread index:              %10d", size_thread_index_t);
+       log_println("stack size:                %10d", size_stacksize);
+       log_println("lock record:               %10d", size_lock_record);
+       log_println("lock hashtable:            %10d", size_lock_hashtable);
+       log_println("lock waiter:               %10d", size_lock_waiter);
+       log_println("                            ----------");
 
        sum =
                count_const_pool_len +
@@ -708,22 +737,26 @@ void statistics_print_memory_usage(void)
                size_stub_native +
                count_utf_len +
                count_vmcode_len +
-               count_extable_len +
                size_stack_map +
                size_string +
                size_threadobject +
+               size_thread_index_t +
+               size_stacksize +
                size_lock_record +
                size_lock_hashtable +
                size_lock_waiter;
 
-       log_println("                        %10d", sum);
+       log_println("                           %10d", sum);
+
        log_println("");
-       log_println("max. code memory:       %10d", maxcodememusage);
-       log_println("max. heap memory:       %10d", maxmemusage);
-       log_println("max. dump memory:       %10d", maxdumpsize);
+
+       log_println("max. code memory:          %10d", maxcodememusage);
+       log_println("max. heap memory:          %10d", maxmemusage);
+       log_println("max. dump memory:          %10d", maxdumpsize);
        log_println("");
-       log_println("heap memory not freed:  %10d", (s4) memoryusage);
-       log_println("dump memory not freed:  %10d", (s4) globalallocateddumpsize);
+       log_println("heap memory not freed:     %10d", (int32_t) memoryusage);
+       log_println("dump memory not freed:     %10d", (int32_t) globalallocateddumpsize);
+
        log_println("");
 }
 
@@ -755,7 +788,13 @@ void statistics_print_gc_memory_usage(void)
                if (count == 1)
                        fprintf(opt_ProfileMemoryUsageGNUPlot, "plot \"profile.dat\" using 1:2 with lines title \"max. Java heap size\", \"profile.dat\" using 1:3 with lines title \"Java heap size\", \"profile.dat\" using 1:4 with lines title \"used\", \"profile.dat\" using 1:5 with lines title \"free\"\n");
 
-               fprintf(opt_ProfileMemoryUsageGNUPlot, "%lld %lld% lld %lld %lld\n", count, max, size, used, free);
+#if SIZEOF_VOID_P == 8
+               fprintf(opt_ProfileMemoryUsageGNUPlot, "%ld %ld %ld %ld %ld\n", count, max, size, used, free);
+#else
+               fprintf(opt_ProfileMemoryUsageGNUPlot, "%lld %lld %lld %lld %lld\n", count, max, size, used, free);
+#endif
+
+               fflush(opt_ProfileMemoryUsageGNUPlot);
        }
        else {
                log_println("GC memory usage -------------------");