Add trace channel for native/managed wrappers.

This commit is licensed under MIT/X11.

diff --git a/mono/mini/driver.c b/mono/mini/driver.c
index d9b05a469dee89a08df41fe48c4fc52f8413c4a8..453abafeefa3e2a152609180adb85ad6ece6c053 100644 (file)
--- a/mono/mini/driver.c
+++ b/mono/mini/driver.c
@@ -1171,6 +1171,7 @@ mini_trace_usage (void)
                 "    none                 No assemblies\n"
                 "    program              Entry point assembly\n"
                 "    assembly             Specifies an assembly\n"
+                "    wrapper              All wrappers bridging native and managed code\n"
                 "    M:Type:Method        Specifies a method\n"
                 "    N:Namespace          Specifies a namespace\n"
                 "    T:Type               Specifies a type\n"

diff --git a/mono/mini/trace.c b/mono/mini/trace.c
index 43516d87a7a0ca7a0c9270c1f662b01b9b97c9ea..f8643d77cdf7acc45e68701666102cd430497dbf 100644 (file)
--- a/mono/mini/trace.c
+++ b/mono/mini/trace.c
@@ -76,6 +76,10 @@ mono_trace_eval (MonoMethod *method)
                case MONO_TRACEOP_PROGRAM:
                        if (trace_spec.assembly && (method->klass->image == mono_assembly_get_image (trace_spec.assembly)))
                                inc = 1; break;
+               case MONO_TRACEOP_WRAPPER:
+                       if ((method->wrapper_type == MONO_WRAPPER_NATIVE_TO_MANAGED) ||
+                               (method->wrapper_type == MONO_WRAPPER_MANAGED_TO_NATIVE))
+                               inc = 1; break;
                case MONO_TRACEOP_METHOD:
                        if (mono_method_desc_full_match ((MonoMethodDesc *) op->data, method))
                                inc = 1; break;
@@ -138,6 +142,7 @@ enum Token {
        TOKEN_PROGRAM,
        TOKEN_EXCEPTION,
        TOKEN_NAMESPACE,
+       TOKEN_WRAPPER,
        TOKEN_STRING,
        TOKEN_EXCLUDE,
        TOKEN_DISABLED,
@@ -185,6 +190,8 @@ get_token (void)
                        return TOKEN_ALL;
                if (strcmp (value, "program") == 0)
                        return TOKEN_PROGRAM;
+               if (strcmp (value, "wrapper") == 0)
+                       return TOKEN_WRAPPER;
                if (strcmp (value, "disabled") == 0)
                        return TOKEN_DISABLED;
                return TOKEN_STRING;
@@ -235,6 +242,8 @@ get_spec (int *last)
                trace_spec.ops [*last].op = MONO_TRACEOP_ALL;
        else if (token == TOKEN_PROGRAM)
                trace_spec.ops [*last].op = MONO_TRACEOP_PROGRAM;
+       else if (token == TOKEN_WRAPPER)
+               trace_spec.ops [*last].op = MONO_TRACEOP_WRAPPER;
        else if (token == TOKEN_NAMESPACE){
                trace_spec.ops [*last].op = MONO_TRACEOP_NAMESPACE;
                trace_spec.ops [*last].data = g_strdup (value);

diff --git a/mono/mini/trace.h b/mono/mini/trace.h
index 6f6d3a0dcac4aa3215d618d84d670901d38f8c8c..af4ce40a39269c12bb384e9e2dac703adbb2063f 100644 (file)
--- a/mono/mini/trace.h
+++ b/mono/mini/trace.h
@@ -11,6 +11,7 @@ typedef enum {
        MONO_TRACEOP_CLASS,
        MONO_TRACEOP_NAMESPACE,
        MONO_TRACEOP_EXCEPTION,
+       MONO_TRACEOP_WRAPPER,
 } MonoTraceOpcode;
 
 typedef struct {