2005-06-07 Gonzalo Paniagua Javier <gonzalo@ximian.com>

	* trace.[ch]:
	* mini.c: added the ability to toggle trace on/off using SIGUSR2.

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

diff --git a/mono/mini/ChangeLog b/mono/mini/ChangeLog
index 9c3b17ddeae33ee018532c13f6bf66551d89ecfd..b8abcc2ab4baedcd71d1512282a5405fd6e1b9f2 100644 (file)
--- a/mono/mini/ChangeLog
+++ b/mono/mini/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07 Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+       * trace.[ch]:
+       * mini.c: added the ability to toggle trace on/off using SIGUSR2.
+
 2005-06-04  Zoltan Varga  <vargaz@freemail.hu>
 
        * mini-ia64.c mini-ia64.h: Fix cleanup of memory stack.

diff --git a/mono/mini/mini.c b/mono/mini/mini.c
index bcff5833dce0d3d941555b83d0beb0d3cdad5af1..a3f0170051bd1eedc3cd247ca3a95f8e0373dd67 100644 (file)
--- a/mono/mini/mini.c
+++ b/mono/mini/mini.c
@@ -9685,6 +9685,14 @@ SIG_HANDLER_SIGNATURE (sigint_signal_handler)
        mono_arch_handle_exception (ctx, exc, FALSE);
 }
 
+static void
+SIG_HANDLER_SIGNATURE (sigusr2_signal_handler)
+{
+       gboolean enabled = mono_trace_is_enabled ();
+
+       mono_trace_enable (!enabled);
+}
+
 #ifndef PLATFORM_WIN32
 static void
 add_signal_handler (int signo, gpointer handler)
@@ -9718,6 +9726,9 @@ mono_runtime_install_handlers (void)
        win32_seh_set_handler(SIGSEGV, sigsegv_signal_handler);
        if (debug_options.handle_sigint)
                win32_seh_set_handler(SIGINT, sigint_signal_handler);
+
+       if (mono_jit_trace_calls != NULL)
+               win32_seh_set_handler(SIGUSR2, sigusr2_signal_handler);
 #else /* !PLATFORM_WIN32 */
 
        /* libpthreads has its own implementation of sigaction(),
@@ -9732,6 +9743,9 @@ mono_runtime_install_handlers (void)
        add_signal_handler (SIGQUIT, sigquit_signal_handler);
        add_signal_handler (SIGILL, sigill_signal_handler);
        add_signal_handler (SIGBUS, sigsegv_signal_handler);
+       if (mono_jit_trace_calls != NULL)
+               add_signal_handler (SIGUSR2, sigusr2_signal_handler);
+
        add_signal_handler (mono_thread_get_abort_signal (), sigusr1_signal_handler);
 
        /* catch SIGSEGV */

diff --git a/mono/mini/trace.c b/mono/mini/trace.c
index 2af8363c6c7bc9f81ebb70905f1ec8b97f483edf..11fdb054c1de17d3e79b3b5e81701aa25024866f 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,8 +267,6 @@ static void indent (int diff) {
                indent_level += diff;
 }
 
-static gboolean enable_trace = TRUE;
-
 void
 mono_trace_enter_method (MonoMethod *method, char *ebp)
 {
@@ -274,7 +277,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);
@@ -413,7 +416,7 @@ mono_trace_leave_method (MonoMethod *method, ...)
        char *fname;
        va_list ap;
 
-       if (!enable_trace)
+       if (!trace_spec.enabled)
                return;
 
        va_start(ap, method);
@@ -524,3 +527,16 @@ handle_enum:
        //printf (" ip: %p\n", __builtin_return_address (1));
        printf ("\n");
 }
+
+void
+mono_trace_enable (gboolean enable)
+{
+       trace_spec.enabled = enable;
+}
+
+gboolean
+mono_trace_is_enabled ()
+{
+       return trace_spec.enabled;
+}
+

diff --git a/mono/mini/trace.h b/mono/mini/trace.h
index a7f884fb250f8a11fea63af9a7f41f16e13582ba..9912a3e8457e80036a4b14b98f0b683625bf1c4b 100644 (file)
--- a/mono/mini/trace.h
+++ b/mono/mini/trace.h
@@ -1,5 +1,6 @@
 #ifndef __MONO_TRACE_H__
 #define __MONO_TRACE_H__
+#include <glib.h>
 
 typedef enum {
        MONO_TRACEOP_ALL,
@@ -18,15 +19,23 @@ typedef struct {
 
 struct MonoTraceSpec {
        int len;
+       gboolean enabled;
        MonoTraceOperation *ops;
 
        MonoAssembly *assembly;
 };
 
+G_BEGIN_DECLS
+
 void
 mono_trace_enter_method (MonoMethod *method, char *ebp);
 
 void 
 mono_trace_leave_method (MonoMethod *method, ...);
 
+void mono_trace_enable (gboolean enable);
+gboolean mono_trace_is_enabled (void);
+
+G_END_DECLS
+
 #endif /* __MONO_TRACE_H__ */