Hmm, this breaks the build :-(

[mono.git] / mono / metadata / gc.c

diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
index a665504661c75dda5d7cb5e5b11aa85ddbdbd7f6..065a427987019739f086e8a0ab48eacb91a2c881 100644 (file)
--- a/mono/metadata/gc.c
+++ b/mono/metadata/gc.c
@@ -37,6 +37,10 @@ extern int __imp_GC_finalize_on_demand;
 #define GC_finalize_on_demand __imp_GC_finalize_on_demand
 #endif
 
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+#include <valgrind/memcheck.h>
+#endif
+
 static int finalize_slot = -1;
 
 static gboolean gc_disabled = FALSE;
@@ -667,6 +671,20 @@ mono_gc_warning (char *msg, GC_word arg)
        mono_trace (G_LOG_LEVEL_WARNING, MONO_TRACE_GC, msg, (unsigned long)arg);
 }
 
+static gboolean
+mono_running_on_valgrind (void)
+{
+#ifdef HAVE_VALGRIND_MEMCHECK_H
+               if (RUNNING_ON_VALGRIND)
+                       return TRUE;
+               else
+                       return FALSE;
+#else
+               return FALSE;
+#endif
+}
+
+
 void mono_gc_init (void)
 {
        InitializeCriticalSection (&handle_section);
@@ -693,6 +711,20 @@ void mono_gc_init (void)
                return;
        }
        
+       /* valgrind does not play nicely with the GC,
+        * so, turn it off when we are under vg.
+        */
+       if (mono_running_on_valgrind ()) {
+               /* valgrind doesnt like g_warning for some reason... */
+               printf ("You are running under valgrind. Currently, valgrind does "
+                          "not support the GC. This program will run with the GC "
+                          "turned off. Your program may take up a fair amount of "
+                          "memory. Also, finalizers will not be run.");
+               
+               gc_disabled = TRUE;
+               return;
+       }
+       
        finalizer_event = CreateEvent (NULL, FALSE, FALSE, NULL);
        pending_done_event = CreateEvent (NULL, TRUE, FALSE, NULL);
        shutdown_event = CreateEvent (NULL, TRUE, FALSE, NULL);