[sgen] Optional check that the concurrent collector doesn't update references.

[mono.git] / mono / metadata / sgen-cardtable.c

diff --git a/mono/metadata/sgen-cardtable.c b/mono/metadata/sgen-cardtable.c
index 4c4fcf8aa3f68c7e2219a9c5f3426b6a79038220..10524efe7b03dcf400a7c0c9c60e278d8da2b8df 100644 (file)
--- a/mono/metadata/sgen-cardtable.c
+++ b/mono/metadata/sgen-cardtable.c
@@ -45,6 +45,8 @@
 #endif
 #include <sys/types.h>
 
+#define ARRAY_OBJ_INDEX(ptr,array,elem_size) (((char*)(ptr) - ((char*)(array) + G_STRUCT_OFFSET (MonoArray, vector))) / (elem_size))
+
 guint8 *sgen_cardtable;
 
 static gboolean need_mod_union;
@@ -111,7 +113,7 @@ sgen_card_table_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int
 
                for (; dest >= start; --src, --dest) {
                        gpointer value = *src;
-                       *dest = value;
+                       SGEN_UPDATE_REFERENCE_ALLOW_NULL (dest, value);
                        if (need_mod_union || sgen_ptr_in_nursery (value))
                                sgen_card_table_mark_address ((mword)dest);
                        sgen_dummy_use (value);
@@ -120,7 +122,7 @@ sgen_card_table_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int
                gpointer *end = dest + count;
                for (; dest < end; ++src, ++dest) {
                        gpointer value = *src;
-                       *dest = value;
+                       SGEN_UPDATE_REFERENCE_ALLOW_NULL (dest, value);
                        if (need_mod_union || sgen_ptr_in_nursery (value))
                                sgen_card_table_mark_address ((mword)dest);
                        sgen_dummy_use (value);
@@ -131,7 +133,6 @@ sgen_card_table_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int
 static void
 sgen_card_table_wbarrier_value_copy (gpointer dest, gpointer src, int count, MonoClass *klass)
 {
-       SgenThreadInfo *__thread_info__;
        size_t element_size = mono_class_value_size (klass, NULL);
        size_t size = count * element_size;
 
@@ -153,7 +154,6 @@ sgen_card_table_wbarrier_value_copy (gpointer dest, gpointer src, int count, Mon
 static void
 sgen_card_table_wbarrier_object_copy (MonoObject* obj, MonoObject *src)
 {
-       SgenThreadInfo *__thread_info__;
        int size = mono_object_class (obj)->instance_size;
 
 #ifdef DISABLE_CRITICAL_REGION
@@ -240,7 +240,7 @@ sgen_card_table_get_card_data (guint8 *data_dest, mword address, mword cards)
 #endif
        }
 
-       return mask;
+       return mask != 0;
 }
 
 void*
@@ -455,6 +455,9 @@ sgen_card_table_finish_scan_remsets (void *start_nursery, void *end_nursery, Sge
 guint8*
 mono_gc_get_card_table (int *shift_bits, gpointer *mask)
 {
+#ifndef MANAGED_WBARRIER
+       return NULL;
+#else
        if (!sgen_cardtable)
                return NULL;
 
@@ -466,6 +469,7 @@ mono_gc_get_card_table (int *shift_bits, gpointer *mask)
 #endif
 
        return sgen_cardtable;
+#endif
 }
 
 gboolean
@@ -475,22 +479,6 @@ mono_gc_card_table_nursery_check (void)
 }
 
 #if 0
-static void
-collect_faulted_cards (void)
-{
-#define CARD_PAGES (CARD_COUNT_IN_BYTES / 4096)
-       int i, count = 0;
-       unsigned char faulted [CARD_PAGES] = { 0 };
-       mincore (sgen_cardtable, CARD_COUNT_IN_BYTES, faulted);
-
-       for (i = 0; i < CARD_PAGES; ++i) {
-               if (faulted [i])
-                       ++count;
-       }
-
-       printf ("TOTAL card pages %d faulted %d\n", CARD_PAGES, count);
-}
-
 void
 sgen_card_table_dump_obj_card (char *object, size_t size, void *dummy)
 {
@@ -587,7 +575,7 @@ sgen_cardtable_scan_object (char *obj, mword block_obj_size, guint8 *cards, gboo
                mword obj_size = sgen_par_object_get_size (vt, (MonoObject*)obj);
                char *obj_end = obj + obj_size;
                size_t card_count;
-               int extra_idx = 0;
+               size_t extra_idx = 0;
 
                MonoArray *arr = (MonoArray*)obj;
                mword desc = (mword)klass->element_class->gc_descr;
@@ -626,8 +614,8 @@ LOOP_HEAD:
 
                card_data = find_next_card (card_data, card_data_end);
                for (; card_data < card_data_end; card_data = find_next_card (card_data + 1, card_data_end)) {
-                       int index;
-                       int idx = (card_data - card_base) + extra_idx;
+                       size_t index;
+                       size_t idx = (card_data - card_base) + extra_idx;
                        char *start = (char*)(obj_start + idx * CARD_SIZE_IN_BYTES);
                        char *card_end = start + CARD_SIZE_IN_BYTES;
                        char *first_elem, *elem;
@@ -683,9 +671,9 @@ LOOP_HEAD:
                HEAVY_STAT (++bloby_objects);
                if (cards) {
                        if (sgen_card_table_is_range_marked (cards, (mword)obj, block_obj_size))
-                               sgen_get_current_object_ops ()->scan_object (obj, queue);
+                               sgen_get_current_object_ops ()->scan_object (obj, sgen_obj_get_descriptor (obj), queue);
                } else if (sgen_card_table_region_begin_scanning ((mword)obj, block_obj_size)) {
-                       sgen_get_current_object_ops ()->scan_object (obj, queue);
+                       sgen_get_current_object_ops ()->scan_object (obj, sgen_obj_get_descriptor (obj), queue);
                }
 
                binary_protocol_card_scan (obj, sgen_safe_object_get_size ((MonoObject*)obj));