[dtrace] Probe for major heap area sweep.

diff --git a/data/mono.d b/data/mono.d
index 8479088c7329470844f26855e34a4b46c41ef5e8..7b00d5df017fddb998378e6ce87d3ebd25984a19 100644 (file)
--- a/data/mono.d
+++ b/data/mono.d
@@ -32,6 +32,7 @@ provider mono {
        probe gc__major__obj__alloc__mature (void *addr, uintptr_t size, char *class_name);
 
        probe gc__nursery__sweeped (void *addr, uintptr_t len);
+       probe gc__major__sweeped (void *addr, uintptr_t len);
 };
 
 #pragma D attributes Evolving/Evolving/Common provider mono provider

diff --git a/mono/metadata/sgen-marksweep.c b/mono/metadata/sgen-marksweep.c
index a3d52f7fd63752e553838684dd38ae0da52437e4..7d208d562f86c1f0a1a89085d31d9a3af0d7ce37 100644 (file)
--- a/mono/metadata/sgen-marksweep.c
+++ b/mono/metadata/sgen-marksweep.c
@@ -1456,7 +1456,14 @@ ms_sweep (void)
                        } else {
                                /* an unmarked object */
                                if (MS_OBJ_ALLOCED (obj, block)) {
+                                       /*
+                                        * FIXME: Merge consecutive
+                                        * slots for lower reporting
+                                        * overhead.  Maybe memset
+                                        * will also benefit?
+                                        */
                                        binary_protocol_empty (obj, block->obj_size);
+                                       MONO_GC_MAJOR_SWEEPED (obj, block->obj_size);
                                        memset (obj, 0, block->obj_size);
                                }
                                *(void**)obj = block->free_list;