[sgen] MONO_GC_DEBUG options to not run finalizers.

diff --git a/man/mono.1 b/man/mono.1
index 66fc7a3fba46ddbdbaf87e44f68f27dfc8f0748e..eaae0856df00fd1c228eb3c8237c1e39b904e2d1 100644 (file)
--- a/man/mono.1
+++ b/man/mono.1
@@ -1267,6 +1267,16 @@ heap corruption issues.
 .ne
 .RE
 .TP
+\fBdo-not-finalize\fR
+If enabled, finalizers will not be run.  Everything else will be
+unaffected: finalizable objects will still be put into the
+finalization queue where they survive until they're scheduled to
+finalize.  Once they're not in the queue anymore they will be
+collected regularly.
+.fi
+.ne
+.RE
+.TP
 \fBMONO_GAC_PREFIX\fR
 Provides a prefix the runtime uses to look for Global Assembly Caches.
 Directories are separated by the platform path separator (colons on

diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index b656f547a31a878ce51023ebd8fbd857b4b5530f..b9dddd477037dbfb7dec01bc22b1944c10d7bf37 100644 (file)
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -278,6 +278,9 @@ static gboolean conservative_stack_mark = FALSE;
 /* If set, do a plausibility check on the scan_starts before and after
    each collection */
 static gboolean do_scan_starts_check = FALSE;
+/* If set, do not run finalizers. */
+static gboolean do_not_finalize = FALSE;
+
 /*
  * If the major collector is concurrent and this is FALSE, we will
  * never initiate a synchronous major collection, unless requested via
@@ -3689,7 +3692,8 @@ mono_gc_invoke_finalizers (void)
                count++;
                /* the object is on the stack so it is pinned */
                /*g_print ("Calling finalizer for object: %p (%s)\n", entry->object, safe_name (entry->object));*/
-               mono_gc_run_finalize (obj, NULL);
+               if (!do_not_finalize)
+                       mono_gc_run_finalize (obj, NULL);
        }
        g_assert (!entry);
        return count;
@@ -5061,6 +5065,8 @@ mono_gc_base_init (void)
                                do_verify_nursery = TRUE;
                                sgen_set_use_managed_allocator (FALSE);
                                enable_nursery_canaries = TRUE;
+                       } else if (!strcmp (opt, "do-not-finalize")) {
+                               do_not_finalize = TRUE;
                        } else if (!sgen_bridge_handle_gc_debug (opt)) {
                                sgen_env_var_error (MONO_GC_DEBUG_NAME, "Ignoring.", "Unknown option `%s`.", opt);
 
@@ -5091,6 +5097,7 @@ mono_gc_base_init (void)
                                fprintf (stderr, "  heap-dump=<filename>\n");
                                fprintf (stderr, "  binary-protocol=<filename>[:<file-size-limit>]\n");
                                fprintf (stderr, "  nursery-canaries\n");
+                               fprintf (stderr, "  do-not-finalize\n");
                                sgen_bridge_print_gc_debug_usage ();
                                fprintf (stderr, "\n");