Tue Feb 26 11:43:34 CET 2002 Paolo Molaro <lupus@ximian.com>

	* interp.c: added profiling for object creation.

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

diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog
index ff04a500b9cf0c6b8d4924512389bdbb4279f6a3..d97d9a743956ae71ae2bce174a0dd0e160b3c729 100644 (file)
--- a/mono/interpreter/ChangeLog
+++ b/mono/interpreter/ChangeLog
@@ -1,4 +1,8 @@
 
+Tue Feb 26 11:43:34 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+       * interp.c: added profiling for object creation.
+
 Mon Feb 25 17:37:07 CET 2002 Paolo Molaro <lupus@ximian.com>
 
        * interp.c: use correct value for guint64 max.

diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c
index 2b4daa6ef983f0777de1ebbbc330571e37cdd9c8..464a4402e4a697e83bb935a6cc5e1d5dde984e7e 100644 (file)
--- a/mono/interpreter/interp.c
+++ b/mono/interpreter/interp.c
@@ -68,6 +68,7 @@ static int tracing = 0;
 static int debug_indent_level = 0;
 
 static GHashTable *profiling = NULL;
+static GHashTable *profiling_classes = NULL;
 
 /*
  * Pull the list of opcodes
@@ -2192,6 +2193,12 @@ ves_exec_method (MonoInvocation *frame)
 
                        csig = child_frame.method->signature;
                        newobj_class = child_frame.method->klass;
+                       if (profiling_classes) {
+                               guint count = GPOINTER_TO_UINT (g_hash_table_lookup (profiling_classes, newobj_class));
+                               count++;
+                               g_hash_table_insert (profiling_classes, newobj_class, GUINT_TO_POINTER (count));
+                       }
+                               
 
                        if (newobj_class->parent == mono_defaults.array_class) {
                                sp -= csig->param_count;
@@ -2666,6 +2673,11 @@ array_constructed:
 
                        sp [-1].type = VAL_OBJ;
                        sp [-1].data.p = o;
+                       if (profiling_classes) {
+                               guint count = GPOINTER_TO_UINT (g_hash_table_lookup (profiling_classes, o->vtable->klass));
+                               count++;
+                               g_hash_table_insert (profiling_classes, o->vtable->klass, GUINT_TO_POINTER (count));
+                       }
 
                        BREAK;
                }
@@ -3825,6 +3837,8 @@ output_profile (GList *funcs)
                g_print ("Method name\t\t\t\t\tTotal (ms) Calls Per call (ms)\n");
        for (tmp = funcs; tmp; tmp = tmp->next) {
                p = tmp->data;
+               if (!(gint)(p->total*1000))
+                       continue;
                g_snprintf (buf, sizeof (buf), "%s.%s::%s(%d)",
                        p->u.method->klass->name_space, p->u.method->klass->name,
                        p->u.method->name, p->u.method->signature->param_count);
@@ -3833,6 +3847,52 @@ output_profile (GList *funcs)
        }
 }
 
+typedef struct {
+       MonoClass *klass;
+       guint count;
+} NewobjProfile;
+
+static gint
+compare_newobj_profile (NewobjProfile *profa, NewobjProfile *profb)
+{
+       return (gint)profb->count - (gint)profa->count;
+}
+
+static void
+build_newobj_profile (MonoClass *class, gpointer count, GList **funcs)
+{
+       NewobjProfile *prof = g_new (NewobjProfile, 1);
+       prof->klass = class;
+       prof->count = GPOINTER_TO_UINT (count);
+       *funcs = g_list_insert_sorted (*funcs, prof, (GCompareFunc)compare_newobj_profile);
+}
+
+static void
+output_newobj_profile (GList *proflist)
+{
+       GList *tmp;
+       NewobjProfile *p;
+       MonoClass *klass;
+       char* isarray;
+       char buf [256];
+
+       if (proflist)
+               g_print ("\n%-52s %9s\n", "Objects created:", "count");
+       for (tmp = proflist; tmp; tmp = tmp->next) {
+               p = tmp->data;
+               klass = p->klass;
+               if (strcmp (klass->name, "Array") == 0) {
+                       isarray = "[]";
+                       klass = klass->element_class;
+               } else {
+                       isarray = "";
+               }
+               g_snprintf (buf, sizeof (buf), "%s.%s%s",
+                       klass->name_space, klass->name, isarray);
+               g_print ("%-52s %9d\n", buf, p->count);
+       }
+}
+
 static MonoException * segv_exception = NULL;
 
 static void
@@ -3863,8 +3923,10 @@ main (int argc, char *argv [])
                        die_on_exception = 1;
                if (strcmp (argv [i], "--print-vtable") == 0)
                        mono_print_vtable = TRUE;
-               if (strcmp (argv [i], "--profile") == 0)
+               if (strcmp (argv [i], "--profile") == 0) {
                        profiling = g_hash_table_new (g_direct_hash, g_direct_equal);
+                       profiling_classes = g_hash_table_new (g_direct_hash, g_direct_equal);
+               }
                if (strcmp (argv [i], "--opcode-count") == 0)
                        ocount = 1;
                if (strcmp (argv [i], "--help") == 0)
@@ -3920,9 +3982,16 @@ main (int argc, char *argv [])
        ++i;
        retval = ves_exec (domain, assembly, argc - i, argv + i);
 #endif
-       if (profiling)
+       if (profiling) {
                g_hash_table_foreach (profiling, (GHFunc)build_profile, &profile);
-       output_profile (profile);
+               output_profile (profile);
+               g_list_free (profile);
+               profile = NULL;
+               
+               g_hash_table_foreach (profiling_classes, (GHFunc)build_newobj_profile, &profile);
+               output_newobj_profile (profile);
+               g_list_free (profile);
+       }
        
        mono_network_cleanup ();
        mono_thread_cleanup ();