Wed Mar 1 15:55:25 CET 2006 Paolo Molaro <lupus@ximian.com>

	* driver.c, mini.c: add hooks for the counters API.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 13d0793b71959badea27f44b2272c0747bc9bc34..503cbbf57693fb75a4131087359ccf67ce51408a 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,4 +1,8 @@
 
+Wed Mar 1 15:55:25 CET 2006 Paolo Molaro <lupus@ximian.com>
+
+       * driver.c, mini.c: add hooks for the counters API.
+
 Wed Mar 1 12:28:04 CET 2006 Paolo Molaro <lupus@ximian.com>
 
        * driver.c: show disabled options.

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index 1748a9232e0109c11eae309b131daf991cdf9bd9..48d989cffb4dda95b1e3b054e7387b915102fdd0 100644 (file)
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -38,6 +38,7 @@
 #include <mono/metadata/mono-debug.h>
 #include <mono/metadata/security-manager.h>
 #include <mono/os/gc_wrapper.h>
+#include "mono/utils/mono-counters.h"
 
 #include "mini.h"
 #include "jit.h"
@@ -763,6 +764,7 @@ mono_main (int argc, char* argv[])
                } else if (strcmp (argv [i], "--print-vtable") == 0) {
                        mono_print_vtable = TRUE;
                } else if (strcmp (argv [i], "--stats") == 0) {
+                       mono_counters_enable (-1);
                        mono_stats.enabled = TRUE;
                        mono_jit_stats.enabled = TRUE;
 #ifndef DISABLE_AOT

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index f1ca32e0d9e2a27ea1de000cf944de63d2db8077..5a1e6e7bf698346325d84865060d237dd24fe92b 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -51,6 +51,7 @@
 #include <mono/metadata/rawbuffer.h>
 #include <mono/utils/mono-math.h>
 #include <mono/utils/mono-compiler.h>
+#include <mono/utils/mono-counters.h>
 #include <mono/os/gc_wrapper.h>
 
 #include "mini.h"
@@ -10874,6 +10875,7 @@ mini_cleanup (MonoDomain *domain)
                g_hash_table_destroy (class_init_hash_addr);
 
        print_jit_stats ();
+       mono_counters_dump (-1, stdout);
 }
 
 void