Merge remote-tracking branch 'joncham/sgen-msvc2'
[mono.git] / mono / metadata / sgen-cardtable.c
index 2d9e1592a4b36cc8d2a1ec5553b357360575678d..4fad8b6678afb2e45404160fd6ecdcfc9b653e7d 100644 (file)
 
 #include "metadata/sgen-gc.h"
 #include "metadata/sgen-cardtable.h"
+#include "metadata/sgen-memory-governor.h"
 #include "utils/mono-counters.h"
 #include "utils/mono-time.h"
+#include "utils/mono-memory-model.h"
 
 #ifdef SGEN_HAVE_CARDTABLE
 
 //#define CARDTABLE_STATS
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #ifdef HAVE_SYS_MMAN_H
 #include <sys/mman.h>
 #endif
@@ -69,6 +73,10 @@ static long long los_card_scan_time;
 
 static long long last_major_scan_time;
 static long long last_los_scan_time;
+
+static void sgen_card_tables_collect_stats (gboolean begin);
+
+
 /*WARNING: This function returns the number of cards regardless of overflow in case of overlapping cards.*/
 static mword
 cards_in_range (mword address, mword size)
@@ -77,6 +85,103 @@ cards_in_range (mword address, mword size)
        return (end >> CARD_BITS) - (address >> CARD_BITS) + 1;
 }
 
+static void
+sgen_card_table_wbarrier_set_field (MonoObject *obj, gpointer field_ptr, MonoObject* value)
+{
+       *(void**)field_ptr = value;
+       if (sgen_ptr_in_nursery (value))
+               sgen_card_table_mark_address ((mword)field_ptr);
+       sgen_dummy_use (value);
+}
+
+static void
+sgen_card_table_wbarrier_set_arrayref (MonoArray *arr, gpointer slot_ptr, MonoObject* value)
+{
+       *(void**)slot_ptr = value;
+       if (sgen_ptr_in_nursery (value))
+               sgen_card_table_mark_address ((mword)slot_ptr);
+       sgen_dummy_use (value); 
+}
+
+static void
+sgen_card_table_wbarrier_arrayref_copy (gpointer dest_ptr, gpointer src_ptr, int count)
+{
+       gpointer *dest = dest_ptr;
+       gpointer *src = src_ptr;
+
+       /*overlapping that required backward copying*/
+       if (src < dest && (src + count) > dest) {
+               gpointer *start = dest;
+               dest += count - 1;
+               src += count - 1;
+
+               for (; dest >= start; --src, --dest) {
+                       gpointer value = *src;
+                       *dest = value;
+                       if (sgen_ptr_in_nursery (value))
+                               sgen_card_table_mark_address ((mword)dest);
+                       sgen_dummy_use (value);
+               }
+       } else {
+               gpointer *end = dest + count;
+               for (; dest < end; ++src, ++dest) {
+                       gpointer value = *src;
+                       *dest = value;
+                       if (sgen_ptr_in_nursery (value))
+                               sgen_card_table_mark_address ((mword)dest);
+                       sgen_dummy_use (value);
+               }
+       }       
+}
+
+static void
+sgen_card_table_wbarrier_value_copy (gpointer dest, gpointer src, int count, MonoClass *klass)
+{
+       size_t element_size = mono_class_value_size (klass, NULL);
+       size_t size = count * element_size;
+
+#ifdef DISABLE_CRITICAL_REGION
+       LOCK_GC;
+#else
+       TLAB_ACCESS_INIT;
+       ENTER_CRITICAL_REGION;
+#endif
+       mono_gc_memmove (dest, src, size);
+       sgen_card_table_mark_range ((mword)dest, size);
+#ifdef DISABLE_CRITICAL_REGION
+       UNLOCK_GC;
+#else
+       EXIT_CRITICAL_REGION;
+#endif
+}
+
+static void
+sgen_card_table_wbarrier_object_copy (MonoObject* obj, MonoObject *src)
+{
+       int size = mono_object_class (obj)->instance_size;
+
+#ifdef DISABLE_CRITICAL_REGION
+       LOCK_GC;
+#else
+       TLAB_ACCESS_INIT;
+       ENTER_CRITICAL_REGION;
+#endif
+       mono_gc_memmove ((char*)obj + sizeof (MonoObject), (char*)src + sizeof (MonoObject),
+                       size - sizeof (MonoObject));
+       sgen_card_table_mark_range ((mword)obj, size);
+#ifdef DISABLE_CRITICAL_REGION
+       UNLOCK_GC;
+#else
+       EXIT_CRITICAL_REGION;
+#endif 
+}
+
+static void
+sgen_card_table_wbarrier_generic_nostore (gpointer ptr)
+{
+       sgen_card_table_mark_address ((mword)ptr);      
+}
+
 #ifdef SGEN_HAVE_OVERLAPPING_CARDS
 
 guint8 *sgen_shadow_cardtable;
@@ -168,29 +273,16 @@ sgen_card_table_is_range_marked (guint8 *cards, mword address, mword size)
 
 }
 
-void
-sgen_card_table_init (void)
+static void
+sgen_card_table_record_pointer (gpointer address)
 {
-       sgen_cardtable = mono_sgen_alloc_os_memory (CARD_COUNT_IN_BYTES, TRUE);
-
-#ifdef SGEN_HAVE_OVERLAPPING_CARDS
-       sgen_shadow_cardtable = mono_sgen_alloc_os_memory (CARD_COUNT_IN_BYTES, TRUE);
-#endif
-
-#ifdef HEAVY_STATISTICS
-       mono_counters_register ("marked cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &marked_cards);
-       mono_counters_register ("scanned cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &scanned_cards);
-       mono_counters_register ("remarked cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &remarked_cards);
+       *sgen_card_table_get_card_address ((mword)address) = 1;
+}
 
-       mono_counters_register ("los marked cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_marked_cards);
-       mono_counters_register ("los array cards scanned ", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_array_cards);
-       mono_counters_register ("los array remsets", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_array_remsets);
-       mono_counters_register ("cardtable scanned objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &scanned_objects);
-       mono_counters_register ("cardtable large objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &large_objects);
-       mono_counters_register ("cardtable bloby objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &bloby_objects);
-#endif
-       mono_counters_register ("cardtable major scan time", MONO_COUNTER_GC | MONO_COUNTER_LONG, &major_card_scan_time);
-       mono_counters_register ("cardtable los scan time", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_card_scan_time);
+static gboolean
+sgen_card_table_find_address (char *addr)
+{
+       return sgen_card_table_address_is_marked ((mword)addr);
 }
 
 #ifdef SGEN_HAVE_OVERLAPPING_CARDS
@@ -241,37 +333,45 @@ clear_cards (mword start, mword size)
 
 #endif
 
-void
-sgen_card_table_clear (void)
+static void
+sgen_card_table_prepare_for_major_collection (void)
 {
        /*XXX we could do this in 2 ways. using mincore or iterating over all sections/los objects */
        sgen_major_collector_iterate_live_block_ranges (clear_cards);
-       mono_sgen_los_iterate_live_block_ranges (clear_cards);
+       sgen_los_iterate_live_block_ranges (clear_cards);
 }
 
-void
-sgen_scan_from_card_tables (void *start_nursery, void *end_nursery, SgenGrayQueue *queue)
+static void
+sgen_card_table_finish_minor_collection (void)
+{
+       sgen_card_tables_collect_stats (FALSE);
+}
+
+static void
+sgen_card_table_finish_scan_remsets (void *start_nursery, void *end_nursery, SgenGrayQueue *queue)
 {
        SGEN_TV_DECLARE (atv);
        SGEN_TV_DECLARE (btv);
 
+       sgen_card_tables_collect_stats (TRUE);
+
 #ifdef SGEN_HAVE_OVERLAPPING_CARDS
        /*FIXME we should have a bit on each block/los object telling if the object have marked cards.*/
        /*First we copy*/
        sgen_major_collector_iterate_live_block_ranges (move_cards_to_shadow_table);
-       mono_sgen_los_iterate_live_block_ranges (move_cards_to_shadow_table);
+       sgen_los_iterate_live_block_ranges (move_cards_to_shadow_table);
 
        /*Then we clear*/
-       sgen_card_table_clear ();
+       sgen_card_table_prepare_for_major_collection ();
 #endif
        SGEN_TV_GETTIME (atv);
        sgen_major_collector_scan_card_table (queue);
        SGEN_TV_GETTIME (btv);
-       last_major_scan_time = SGEN_TV_ELAPSED_MS (atv, btv); 
+       last_major_scan_time = SGEN_TV_ELAPSED (atv, btv); 
        major_card_scan_time += last_major_scan_time;
-       mono_sgen_los_scan_card_table (queue);
+       sgen_los_scan_card_table (queue);
        SGEN_TV_GETTIME (atv);
-       last_los_scan_time = SGEN_TV_ELAPSED_MS (btv, atv);
+       last_los_scan_time = SGEN_TV_ELAPSED (btv, atv);
        los_card_scan_time += last_los_scan_time;
 }
 
@@ -389,9 +489,6 @@ sgen_cardtable_scan_object (char *obj, mword block_obj_size, guint8 *cards, Sgen
 {
        MonoVTable *vt = (MonoVTable*)SGEN_LOAD_VTABLE (obj);
        MonoClass *klass = vt->klass;
-       CopyOrMarkObjectFunc copy_func = mono_sgen_get_copy_object ();
-       ScanObjectFunc scan_object_func = mono_sgen_get_minor_scan_object ();
-       ScanVTypeFunc scan_vtype_func = mono_sgen_get_minor_scan_vtype ();
 
        HEAVY_STAT (++large_objects);
 
@@ -402,7 +499,7 @@ sgen_cardtable_scan_object (char *obj, mword block_obj_size, guint8 *cards, Sgen
                guint8 *card_data, *card_base;
                guint8 *card_data_end;
                char *obj_start = sgen_card_table_align_pointer (obj);
-               mword obj_size = mono_sgen_par_object_get_size (vt, (MonoObject*)obj);
+               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;
@@ -457,9 +554,13 @@ LOOP_HEAD:
 
                        elem = (char*)mono_array_addr_with_size ((MonoArray*)obj, elem_size, index);
                        if (klass->element_class->valuetype) {
+                               ScanVTypeFunc scan_vtype_func = sgen_get_current_object_ops ()->scan_vtype;
+
                                for (; elem < card_end; elem += elem_size)
                                        scan_vtype_func (elem, desc, queue);
                        } else {
+                               CopyOrMarkObjectFunc copy_func = sgen_get_current_object_ops ()->copy_or_mark_object;
+
                                HEAVY_STAT (++los_array_cards);
                                for (; elem < card_end; elem += SIZEOF_VOID_P) {
                                        gpointer new, old = *(gpointer*)elem;
@@ -468,7 +569,7 @@ LOOP_HEAD:
                                                copy_func ((void**)elem, queue);
                                                new = *(gpointer*)elem;
                                                if (G_UNLIKELY (sgen_ptr_in_nursery (new)))
-                                                       mono_sgen_add_to_global_remset (elem);
+                                                       sgen_add_to_global_remset (elem);
                                        }
                                }
                        }
@@ -488,9 +589,9 @@ LOOP_HEAD:
                HEAVY_STAT (++bloby_objects);
                if (cards) {
                        if (sgen_card_table_is_range_marked (cards, (mword)obj, block_obj_size))
-                               scan_object_func (obj, queue);
+                               sgen_get_current_object_ops ()->scan_object (obj, queue);
                } else if (sgen_card_table_region_begin_scanning ((mword)obj, block_obj_size)) {
-                       scan_object_func (obj, queue);
+                       sgen_get_current_object_ops ()->scan_object (obj, queue);
                }
        }
 }
@@ -529,7 +630,7 @@ count_remarked_cards (mword start, mword size)
 
 #endif
 
-void
+static void
 sgen_card_tables_collect_stats (gboolean begin)
 {
 #ifdef CARDTABLE_STATS
@@ -539,20 +640,61 @@ sgen_card_tables_collect_stats (gboolean begin)
                cur_stats = &major_stats;
                sgen_major_collector_iterate_live_block_ranges (count_marked_cards);
                cur_stats = &los_stats;
-               mono_sgen_los_iterate_live_block_ranges (count_marked_cards);
+               sgen_los_iterate_live_block_ranges (count_marked_cards);
        } else {
                cur_stats = &major_stats;
                sgen_major_collector_iterate_live_block_ranges (count_marked_cards);
                cur_stats = &los_stats;
-               mono_sgen_los_iterate_live_block_ranges (count_remarked_cards);
-               printf ("cards major (t %d m %d r %d)  los (t %d m %d r %d) major_scan %lld los_scan %lld\n", 
+               sgen_los_iterate_live_block_ranges (count_remarked_cards);
+               printf ("cards major (t %d m %d r %d)  los (t %d m %d r %d) major_scan %.2fms los_scan %.2fms\n", 
                        major_stats.total, major_stats.marked, major_stats.remarked,
                        los_stats.total, los_stats.marked, los_stats.remarked,
-                       last_major_scan_time, last_los_scan_time);
+                       last_major_scan_time / 1000.0, last_los_scan_time / 1000.0);
        }
 #endif
 }
 
+void
+sgen_card_table_init (SgenRemeberedSet *remset)
+{
+       sgen_cardtable = sgen_alloc_os_memory (CARD_COUNT_IN_BYTES, SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE, "card table");
+
+#ifdef SGEN_HAVE_OVERLAPPING_CARDS
+       sgen_shadow_cardtable = sgen_alloc_os_memory (CARD_COUNT_IN_BYTES, SGEN_ALLOC_INTERNAL | SGEN_ALLOC_ACTIVATE, "shadow card table");
+#endif
+
+#ifdef HEAVY_STATISTICS
+       mono_counters_register ("marked cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &marked_cards);
+       mono_counters_register ("scanned cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &scanned_cards);
+       mono_counters_register ("remarked cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &remarked_cards);
+
+       mono_counters_register ("los marked cards", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_marked_cards);
+       mono_counters_register ("los array cards scanned ", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_array_cards);
+       mono_counters_register ("los array remsets", MONO_COUNTER_GC | MONO_COUNTER_LONG, &los_array_remsets);
+       mono_counters_register ("cardtable scanned objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &scanned_objects);
+       mono_counters_register ("cardtable large objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &large_objects);
+       mono_counters_register ("cardtable bloby objects", MONO_COUNTER_GC | MONO_COUNTER_LONG, &bloby_objects);
+#endif
+       mono_counters_register ("cardtable major scan time", MONO_COUNTER_GC | MONO_COUNTER_TIME_INTERVAL, &major_card_scan_time);
+       mono_counters_register ("cardtable los scan time", MONO_COUNTER_GC | MONO_COUNTER_TIME_INTERVAL, &los_card_scan_time);
+
+
+       remset->wbarrier_set_field = sgen_card_table_wbarrier_set_field;
+       remset->wbarrier_set_arrayref = sgen_card_table_wbarrier_set_arrayref;
+       remset->wbarrier_arrayref_copy = sgen_card_table_wbarrier_arrayref_copy;
+       remset->wbarrier_value_copy = sgen_card_table_wbarrier_value_copy;
+       remset->wbarrier_object_copy = sgen_card_table_wbarrier_object_copy;
+       remset->wbarrier_generic_nostore = sgen_card_table_wbarrier_generic_nostore;
+       remset->record_pointer = sgen_card_table_record_pointer;
+
+       remset->finish_scan_remsets = sgen_card_table_finish_scan_remsets;
+
+       remset->finish_minor_collection = sgen_card_table_finish_minor_collection;
+       remset->prepare_for_major_collection = sgen_card_table_prepare_for_major_collection;
+
+       remset->find_address = sgen_card_table_find_address;
+}
+
 #else
 
 void
@@ -575,4 +717,4 @@ mono_gc_get_card_table (int *shift_bits, gpointer *mask)
 
 #endif
 
-#endif /*HAVE_SGEN_GC*/
\ No newline at end of file
+#endif /*HAVE_SGEN_GC*/