X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fvm%2Fstatistics.h;h=484fba15c27fd800151b073896b17f50f093b4d4;hb=d78645adcbad2ba7424154595e5390745f645a6d;hp=a2d7eca6752defdce6ed84dcd8913c8e2298e757;hpb=86c7fab9558b8ea0e0e25b38a811dac39c0be214;p=cacao.git

diff --git a/src/vm/statistics.h b/src/vm/statistics.h
index a2d7eca67..484fba15c 100644
--- a/src/vm/statistics.h
+++ b/src/vm/statistics.h
@@ -1,9 +1,7 @@
 /* src/vm/statistics.h - exports global varables for statistics
 
-   Copyright (C) 1996-2005, 2006 R. Grafl, A. Krall, C. Kruegel,
-   C. Oates, R. Obermaisser, M. Platter, M. Probst, S. Ring,
-   E. Steiner, C. Thalinger, D. Thuernbeck, P. Tomsich, C. Ullrich,
-   J. Wenninger, Institut f. Computersprachen - TU Wien
+   Copyright (C) 1996-2005, 2006, 2007, 2008
+   CACAOVM - Verein zur Foerderung der freien virtuellen Maschine CACAO
 
    This file is part of CACAO.
 
@@ -22,14 +20,6 @@
    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
    02110-1301, USA.
 
-   Contact: cacao@cacaojvm.org
-
-   Authors: Christian Thalinger
-
-   Changes:
-
-   $Id: statistics.h 5093 2006-07-10 13:36:47Z twisti $
-
 */
 
 
@@ -37,6 +27,9 @@
 #define _STATISTICS_H
 
 #include "config.h"
+
+#include <stdint.h>
+
 #include "vm/types.h"
 
 #include "vm/global.h"
@@ -98,8 +91,30 @@ extern s4 globaluseddumpsize;
 extern s4 size_classinfo;
 extern s4 size_fieldinfo;
 extern s4 size_methodinfo;
+extern s4 size_lineinfo;
 extern s4 size_codeinfo;
 
+extern s4 size_stub_native;
+
+extern s4 size_stack_map;
+extern s4 size_string;
+
+extern s4 size_threadobject;
+extern int32_t size_thread_index_t;
+extern int32_t size_stacksize;
+
+extern s4 size_lock_record;
+extern s4 size_lock_hashtable;
+extern s4 size_lock_waiter;
+
+extern int32_t count_linenumbertable;
+extern int32_t size_linenumbertable;
+
+extern s4 size_patchref;
+
+extern u8 count_calls_java_to_native;
+extern u8 count_calls_native_to_java;
+
 extern int count_const_pool_len;
 extern int count_classref_len;
 extern int count_parsed_desc_len;
@@ -133,8 +148,12 @@ extern int count_mov_mem_mem;
 
 extern int count_jit_calls;
 extern int count_methods;
-extern int count_spills;
-extern int count_spills_read;
+extern int count_spills_read_ila;
+extern int count_spills_read_flt;
+extern int count_spills_read_dbl;
+extern int count_spills_write_ila;
+extern int count_spills_write_flt;
+extern int count_spills_write_dbl;
 extern int count_pcmd_activ;
 extern int count_pcmd_drop;
 extern int count_pcmd_zero;
@@ -167,9 +186,18 @@ extern int count_tryblocks;
 extern int count_code_len;
 extern int count_data_len;
 extern int count_cstub_len;
-extern int count_nstub_len;
 extern int count_max_new_stack;
 extern int count_upper_bound_new_stack;
+
+extern int count_emit_branch;
+extern int count_emit_branch_8bit;
+extern int count_emit_branch_16bit;
+extern int count_emit_branch_32bit;
+extern int count_emit_branch_64bit;
+
+extern s4 count_branches_resolved;
+extern s4 count_branches_unresolved;
+
 extern int *count_block_stack;
 extern int *count_analyse_iterations;
 extern int *count_method_bb_distribution;
@@ -201,6 +229,10 @@ extern s4 count_schedule_critical_path;
 
 /* function prototypes ********************************************************/
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 s8 getcputime(void);
 
 void loadingtime_start(void);
@@ -211,14 +243,20 @@ void compilingtime_stop(void);
 void print_times(void);
 void print_stats(void);
 
-void mem_usagelog(bool givewarnings);
+void statistics_print_date(void);
+void statistics_print_memory_usage(void);
+void statistics_print_gc_memory_usage(void);
 
+void mem_usagelog(bool givewarnings);
 
-void nativeinvokation(void);
 void compiledinvokation(void);
 void jnicallXmethodnvokation(void);
 void jniinvokation(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif /* _STATISTICS_H */