2006-06-04 Zoltan Varga <vargaz@gmail.com>

[mono.git] / mono / mini / trace.c

diff --git a/mono/mini/trace.c b/mono/mini/trace.c
index e87fb7266e9a59bd643b296672c0e130a51f6d40..a3366b226beb350b6beeb0e05257448d8cb1eee6 100644 (file)
--- a/mono/mini/trace.c
+++ b/mono/mini/trace.c
@@ -96,6 +96,7 @@ enum Token {
        TOKEN_NAMESPACE,
        TOKEN_STRING,
        TOKEN_EXCLUDE,
+       TOKEN_DISABLED,
        TOKEN_SEPARATOR,
        TOKEN_END,
        TOKEN_ERROR
@@ -128,6 +129,8 @@ get_token (void)
                        return TOKEN_ALL;
                if (strcmp (value, "program") == 0)
                        return TOKEN_PROGRAM;
+               if (strcmp (value, "disabled") == 0)
+                       return TOKEN_DISABLED;
                return TOKEN_STRING;
        }
        if (*input == '-'){
@@ -198,8 +201,9 @@ get_spec (int *last)
        } else if (token == TOKEN_STRING){
                trace_spec.ops [*last].op = MONO_TRACEOP_ASSEMBLY;
                trace_spec.ops [*last].data = g_strdup (value);
-       }
-       else {
+       } else if (token == TOKEN_DISABLED) {
+               trace_spec.enabled = FALSE;
+       } else {
                fprintf (stderr, "Syntax error in trace option specification\n");
                return TOKEN_ERROR;
        }
@@ -214,7 +218,8 @@ mono_trace_parse_options (char *options)
        int size = 1;
        int last_used;
        int token;
-       
+
+       trace_spec.enabled = TRUE;
        if (*p == 0){
                trace_spec.len = 1;
                trace_spec.ops = g_new0 (MonoTraceOperation, 1);
@@ -262,7 +267,26 @@ static void indent (int diff) {
                indent_level += diff;
 }
 
-static gboolean enable_trace = TRUE;
+static char *
+string_to_utf8 (MonoString *s)
+{
+       char *as;
+       GError *error = NULL;
+
+       g_assert (s);
+
+       if (!s->length)
+               return g_strdup ("");
+
+       as = g_utf16_to_utf8 (mono_string_chars (s), s->length, NULL, NULL, &error);
+       if (error) {
+               /* Happens with StringBuilders */
+               g_error_free (error);
+               return g_strdup ("<INVALID UTF8>");
+       }
+       else
+               return as;
+}
 
 void
 mono_trace_enter_method (MonoMethod *method, char *ebp)
@@ -274,7 +298,7 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
        MonoMethodSignature *sig;
        char *fname;
 
-       if (!enable_trace)
+       if (!trace_spec.enabled)
                return;
 
        fname = mono_method_full_name (method, TRUE);
@@ -313,7 +337,11 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
                                class = o->vtable->klass;
 
                                if (class == mono_defaults.string_class) {
-                                       printf ("this:[STRING:%p:%s], ", o, mono_string_to_utf8 ((MonoString *)o));
+                                       MonoString *s = (MonoString*)o;
+                                       char *as = string_to_utf8 (s);
+
+                                       printf ("this:[STRING:%p:%s], ", o, as);
+                                       g_free (as);
                                } else {
                                        printf ("this:%p[%s.%s %s], ", o, class->name_space, class->name, o->vtable->domain->friendly_name);
                                }
@@ -330,7 +358,7 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
                
                if (type->byref) {
                        printf ("[BYREF:%p], ", *cpos); 
-               } else switch (type->type) {
+               } else switch (mono_type_get_underlying_type (type)->type) {
                        
                case MONO_TYPE_I:
                case MONO_TYPE_U:
@@ -353,8 +381,13 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
                case MONO_TYPE_STRING: {
                        MonoString *s = *((MonoString **)cpos);
                        if (s) {
+                               char *as;
+
                                g_assert (((MonoObject *)s)->vtable->klass == mono_defaults.string_class);
-                               printf ("[STRING:%p:%s], ", s, mono_string_to_utf8 (s));
+                               as = string_to_utf8 (s);
+
+                               printf ("[STRING:%p:%s], ", s, as);
+                               g_free (as);
                        } else 
                                printf ("[STRING:null], ");
                        break;
@@ -366,7 +399,10 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
                                class = o->vtable->klass;
                    
                                if (class == mono_defaults.string_class) {
-                                       printf ("[STRING:%p:%s], ", o, mono_string_to_utf8 ((MonoString *)o));
+                                       char *as = string_to_utf8 ((MonoString*)o);
+
+                                       printf ("[STRING:%p:%s], ", o, as);
+                                       g_free (as);
                                } else if (class == mono_defaults.int32_class) {
                                        printf ("[INT32:%p:%d], ", o, *(gint32 *)((char *)o + sizeof (MonoObject)));
                                } else
@@ -404,6 +440,7 @@ mono_trace_enter_method (MonoMethod *method, char *ebp)
        }
 
        printf (")\n");
+       fflush (stdout);
 }
 
 void
@@ -413,7 +450,7 @@ mono_trace_leave_method (MonoMethod *method, ...)
        char *fname;
        va_list ap;
 
-       if (!enable_trace)
+       if (!trace_spec.enabled)
                return;
 
        va_start(ap, method);
@@ -455,8 +492,12 @@ handle_enum:
                MonoString *s = va_arg (ap, MonoString *);
 ;
                if (s) {
+                       char *as;
+
                        g_assert (((MonoObject *)s)->vtable->klass == mono_defaults.string_class);
-                       printf ("[STRING:%p:%s]", s, mono_string_to_utf8 (s));
+                       as = string_to_utf8 (s);
+                       printf ("[STRING:%p:%s]", s, as);
+                       g_free (as);
                } else 
                        printf ("[STRING:null], ");
                break;
@@ -523,4 +564,18 @@ handle_enum:
 
        //printf (" ip: %p\n", __builtin_return_address (1));
        printf ("\n");
+       fflush (stdout);
+}
+
+void
+mono_trace_enable (gboolean enable)
+{
+       trace_spec.enabled = enable;
 }
+
+gboolean
+mono_trace_is_enabled ()
+{
+       return trace_spec.enabled;
+}
+