[sgen] MONO_GC_DEBUG option for disabling the managed allocator.

This can be used to make all object allocations show up in the dtrace probe.

diff --git a/man/mono.1 b/man/mono.1
index 19508002a0f8a76486653c6acc2a49d3fdaecbfc..1c4cbf31f92f3971c0798fcc37823744ca7fc46e 100644 (file)
--- a/man/mono.1
+++ b/man/mono.1
@@ -1189,6 +1189,9 @@ Don't do major collections.
 Forces the GC to scan the stack conservatively, even if precise
 scanning is available.
 .TP
+\fBno-managed-allocator\fR
+Disables the managed allocator.
+.TP
 \fBcheck-scan-starts\fR
 If set, does a plausibility check on the scan_starts before and after each collection
 .TP

diff --git a/mono/metadata/sgen-alloc.c b/mono/metadata/sgen-alloc.c
index 14486c273591d1fbe028fd6d97fc67fef632c0c7..1f21fdd2febae7286a7c13ba423d40144d462907 100644 (file)
--- a/mono/metadata/sgen-alloc.c
+++ b/mono/metadata/sgen-alloc.c
@@ -69,6 +69,8 @@ enum {
 
 #undef OPDEF
 
+static gboolean use_managed_allocator = TRUE;
+
 #ifdef HEAVY_STATISTICS
 static long long stat_objects_alloced = 0;
 static long long stat_bytes_alloced = 0;
@@ -986,12 +988,21 @@ mono_gc_get_managed_array_allocator (MonoVTable *vtable, int rank)
 #endif
 }
 
+void
+sgen_set_use_managed_allocator (gboolean flag)
+{
+       use_managed_allocator = flag;
+}
+
 MonoMethod*
 mono_gc_get_managed_allocator_by_type (int atype)
 {
 #ifdef MANAGED_ALLOCATION
        MonoMethod *res;
 
+       if (!use_managed_allocator)
+               return NULL;
+
        if (!mono_runtime_has_tls_get ())
                return NULL;
 

diff --git a/mono/metadata/sgen-gc.c b/mono/metadata/sgen-gc.c
index e0828fad3e62576980747917c899888a2b20138c..e9de61702b318adef344a2109bb39123a77d22d5 100644 (file)
--- a/mono/metadata/sgen-gc.c
+++ b/mono/metadata/sgen-gc.c
@@ -4541,6 +4541,8 @@ mono_gc_base_init (void)
                                do_verify_nursery = TRUE;
                        } else if (!strcmp (opt, "dump-nursery-at-minor-gc")) {
                                do_dump_nursery_content = TRUE;
+                       } else if (!strcmp (opt, "no-managed-allocator")) {
+                               sgen_set_use_managed_allocator (FALSE);
                        } else if (!strcmp (opt, "disable-minor")) {
                                disable_minor_collections = TRUE;
                        } else if (!strcmp (opt, "disable-major")) {
@@ -4568,12 +4570,21 @@ mono_gc_base_init (void)
                                fprintf (stderr, "  verify-before-allocs[=<n>]\n");
                                fprintf (stderr, "  check-at-minor-collections\n");
                                fprintf (stderr, "  verify-before-collections\n");
+                               fprintf (stderr, "  verify-nursery-at-minor-gc\n");
+                               fprintf (stderr, "  dump-nursery-at-minor-gc\n");
                                fprintf (stderr, "  disable-minor\n");
                                fprintf (stderr, "  disable-major\n");
                                fprintf (stderr, "  xdomain-checks\n");
                                fprintf (stderr, "  clear-at-gc\n");
+                               fprintf (stderr, "  clear-nursery-at-gc\n");
+                               fprintf (stderr, "  check-scan-starts\n");
+                               fprintf (stderr, "  no-managed-allocator\n");
                                fprintf (stderr, "  print-allowance\n");
                                fprintf (stderr, "  print-pinning\n");
+                               fprintf (stderr, "  heap-dump=<filename>\n");
+#ifdef SGEN_BINARY_PROTOCOL
+                               fprintf (stderr, "  binary-protocol=<filename>\n");
+#endif
                                exit (1);
                        }
                }

diff --git a/mono/metadata/sgen-gc.h b/mono/metadata/sgen-gc.h
index 7e6408885e14c32820f51f9f9d901e87d60c7f85..0a946d0b2afdadef834986954894056a70e77f0d 100644 (file)
--- a/mono/metadata/sgen-gc.h
+++ b/mono/metadata/sgen-gc.h
@@ -1028,6 +1028,7 @@ typedef enum {
 
 void sgen_init_tlab_info (SgenThreadInfo* info);
 void sgen_clear_tlabs (void);
+void sgen_set_use_managed_allocator (gboolean flag);
 gboolean sgen_is_managed_allocator (MonoMethod *method);
 gboolean sgen_has_managed_allocator (void);