guint8 *sgen_cardtable;
+
+#ifdef HEAVY_STATISTICS
+long long marked_cards;
+long long scanned_cards;
+long long scanned_objects;
+
+static long long los_marked_cards;
+static long long large_objects;
+static long long bloby_objects;
+static long long los_array_cards;
+static long long los_array_remsets;
+
+#endif
+static long long major_card_scan_time;
+static long long los_card_scan_time;
+
+static long long last_major_scan_time;
+static long long last_los_scan_time;
/*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)
{
- mword end = address + size;
+ mword end = address + MAX (1, size) - 1;
return (end >> CARD_BITS) - (address >> CARD_BITS) + 1;
}
}
static gboolean
-sgen_card_table_is_range_marked (guint8 *cards, mword size)
+sgen_card_table_is_range_marked (guint8 *cards, mword address, mword size)
{
- mword start = 0;
- while (start <= size) {
+ guint8 *end = cards + cards_in_range (address, size);
+
+ /*This is safe since this function is only called by code that only passes continuous card blocks*/
+ while (cards != end) {
if (*cards++)
return TRUE;
- start += CARD_SIZE_IN_BYTES;
}
return FALSE;
#ifdef SGEN_HAVE_OVERLAPPING_CARDS
sgen_shadow_cardtable = mono_sgen_alloc_os_memory (CARD_COUNT_IN_BYTES, TRUE);
#endif
-}
-
-
-void los_scan_card_table (GrayQueue *queue);
-void los_iterate_live_block_ranges (sgen_cardtable_block_callback callback);
-
+#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 ("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);
+}
#ifdef SGEN_HAVE_OVERLAPPING_CARDS
if (to + bytes > SGEN_SHADOW_CARDTABLE_END) {
size_t first_chunk = SGEN_SHADOW_CARDTABLE_END - to;
+ size_t second_chunk = MIN (CARD_COUNT_IN_BYTES, bytes) - first_chunk;
memcpy (to, from, first_chunk);
- memcpy (sgen_shadow_cardtable, from + first_chunk, bytes - first_chunk);
+ memcpy (sgen_shadow_cardtable, sgen_cardtable, second_chunk);
} else {
memcpy (to, from, bytes);
}
/*XXX we could do this in 2 ways. using mincore or iterating over all sections/los objects */
if (use_cardtable) {
major_collector.iterate_live_block_ranges (clear_cards);
- los_iterate_live_block_ranges (clear_cards);
+ mono_sgen_los_iterate_live_block_ranges (clear_cards);
}
}
static void
scan_from_card_tables (void *start_nursery, void *end_nursery, GrayQueue *queue)
{
if (use_cardtable) {
+ TV_DECLARE (atv);
+ TV_DECLARE (btv);
+
#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*/
major_collector.iterate_live_block_ranges (move_cards_to_shadow_table);
- los_iterate_live_block_ranges (move_cards_to_shadow_table);
+ mono_sgen_los_iterate_live_block_ranges (move_cards_to_shadow_table);
/*Then we clear*/
card_table_clear ();
#endif
+ TV_GETTIME (atv);
major_collector.scan_card_table (queue);
- los_scan_card_table (queue);
+ TV_GETTIME (btv);
+ last_major_scan_time = TV_ELAPSED_MS (atv, btv);
+ major_card_scan_time += last_major_scan_time;
+ mono_sgen_los_scan_card_table (queue);
+ TV_GETTIME (atv);
+ last_los_scan_time = TV_ELAPSED_MS (btv, atv);
+ los_card_scan_time += last_los_scan_time;
}
}
return sgen_cardtable;
}
+#if 0
static void
collect_faulted_cards (void)
{
printf ("TOTAL card pages %d faulted %d\n", CARD_PAGES, count);
}
+#endif
+
+#define MWORD_MASK (sizeof (mword) - 1)
+
+static inline int
+find_card_offset (mword card)
+{
+/*XXX Use assembly as this generates some pretty bad code */
+#if defined(__i386__) && defined(__GNUC__)
+ return (__builtin_ffs (card) - 1) / 8;
+#elif defined(__x86_64__) && defined(__GNUC__)
+ return (__builtin_ffsll (card) - 1) / 8;
+#else
+ // FIXME:
+ g_assert_not_reached ();
+ /*
+ int i;
+ guint8 *ptr = &card;
+ for (i = 0; i < sizeof (mword); ++i) {
+ if (card [i])
+ return i;
+ }
+ */
+ return 0;
+#endif
+}
+
+static guint8*
+find_next_card (guint8 *card_data, guint8 *end)
+{
+ mword *cards, *cards_end;
+ mword card;
+ while ((((mword)card_data) & MWORD_MASK) && card_data < end) {
+ if (*card_data)
+ return card_data;
+ ++card_data;
+ }
+
+ if (card_data == end)
+ return end;
+
+ cards = (mword*)card_data;
+ cards_end = (mword*)((mword)end & ~MWORD_MASK);
+ while (cards < cards_end) {
+ card = *cards;
+ if (card)
+ return (guint8*)cards + find_card_offset (card);
+ ++cards;
+ }
+
+ card_data = (guint8*)cards_end;
+ while (card_data < end) {
+ if (*card_data)
+ return card_data;
+ ++card_data;
+ }
+
+ return end;
+}
void
sgen_cardtable_scan_object (char *obj, mword obj_size, guint8 *cards, SgenGrayQueue *queue)
MonoVTable *vt = (MonoVTable*)LOAD_VTABLE (obj);
MonoClass *klass = vt->klass;
- if (!klass->has_references)
+ HEAVY_STAT (++large_objects);
+
+ if (!SGEN_VTABLE_HAS_REFERENCES (vt))
return;
if (vt->rank) {
- guint8 *card_data;
+ guint8 *card_data, *card_base;
+ guint8 *card_data_end;
+ char *obj_start = sgen_card_table_align_pointer (obj);
+ char *obj_end = obj + obj_size;
+ size_t card_count;
+ int extra_idx = 0;
+
MonoArray *arr = (MonoArray*)obj;
mword desc = (mword)klass->element_class->gc_descr;
- char *start = sgen_card_table_align_pointer (obj);
- char *end = obj + obj_size;
- int size = mono_array_element_size (klass);
+ int elem_size = mono_array_element_size (klass);
- g_assert (desc);
+#ifdef SGEN_HAVE_OVERLAPPING_CARDS
+ guint8 *overflow_scan_end = NULL;
+#endif
if (cards)
card_data = cards;
else
card_data = sgen_card_table_get_card_scan_address ((mword)obj);
- for (; start < end; start += CARD_SIZE_IN_BYTES, ++card_data) {
- char *elem, *card_end;
- uintptr_t index;
+ card_base = card_data;
+ card_count = cards_in_range ((mword)obj, obj_size);
+ card_data_end = card_data + card_count;
+
- if (!*card_data)
- continue;
+#ifdef SGEN_HAVE_OVERLAPPING_CARDS
+ /*Check for overflow and if so, setup to scan in two steps*/
+ if (!cards && card_data_end >= SGEN_SHADOW_CARDTABLE_END) {
+ overflow_scan_end = sgen_shadow_cardtable + (card_data_end - SGEN_SHADOW_CARDTABLE_END);
+ card_data_end = SGEN_SHADOW_CARDTABLE_END;
+ }
+
+LOOP_HEAD:
+#endif
+
+ 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;
+ char *start = (char*)(obj_start + idx * CARD_SIZE_IN_BYTES);
+ char *card_end = start + CARD_SIZE_IN_BYTES;
+ char *elem;
+
+ HEAVY_STAT (++los_marked_cards);
if (!cards)
sgen_card_table_prepare_card_for_scanning (card_data);
- card_end = start + CARD_SIZE_IN_BYTES;
- if (end < card_end)
- card_end = end;
+ card_end = MIN (card_end, obj_end);
if (start <= (char*)arr->vector)
index = 0;
else
- index = ARRAY_OBJ_INDEX (start, obj, size);
+ index = ARRAY_OBJ_INDEX (start, obj, elem_size);
- elem = (char*)mono_array_addr_with_size ((MonoArray*)obj, size, index);
+ elem = (char*)mono_array_addr_with_size ((MonoArray*)obj, elem_size, index);
if (klass->element_class->valuetype) {
- while (elem < card_end) {
+ for (; elem < card_end; elem += elem_size)
major_collector.minor_scan_vtype (elem, desc, nursery_start, nursery_next, queue);
- elem += size;
- }
} else {
- while (elem < card_end) {
+ HEAVY_STAT (++los_array_cards);
+ for (; elem < card_end; elem += SIZEOF_VOID_P) {
gpointer new, old = *(gpointer*)elem;
- if (old) {
+ if (G_UNLIKELY (ptr_in_nursery (old))) {
+ HEAVY_STAT (++los_array_remsets);
major_collector.copy_object ((void**)elem, queue);
new = *(gpointer*)elem;
if (G_UNLIKELY (ptr_in_nursery (new)))
mono_sgen_add_to_global_remset (elem);
}
- elem += size;
}
}
}
+
+#ifdef SGEN_HAVE_OVERLAPPING_CARDS
+ if (overflow_scan_end) {
+ extra_idx = card_data - card_base;
+ card_base = card_data = sgen_shadow_cardtable;
+ card_data_end = overflow_scan_end;
+ overflow_scan_end = NULL;
+ goto LOOP_HEAD;
+ }
+#endif
+
} else {
+ HEAVY_STAT (++bloby_objects);
if (cards) {
- if (sgen_card_table_is_range_marked (cards, obj_size))
+ if (sgen_card_table_is_range_marked (cards, (mword)obj, obj_size))
major_collector.minor_scan_object (obj, queue);
} else if (sgen_card_table_region_begin_scanning ((mword)obj, obj_size)) {
major_collector.minor_scan_object (obj, queue);
#ifdef CARDTABLE_STATS
-static int total_cards, marked_cards, remarked_cards;
+typedef struct {
+ int total, marked, remarked;
+} card_stats;
+
+static card_stats major_stats, los_stats;
+static card_stats *cur_stats;
static void
count_marked_cards (mword start, mword size)
{
mword end = start + size;
while (start <= end) {
- ++total_cards;
+ ++cur_stats->total;
if (sgen_card_table_address_is_marked (start))
- ++marked_cards;
+ ++cur_stats->marked;
start += CARD_SIZE_IN_BYTES;
}
}
mword end = start + size;
while (start <= end) {
if (sgen_card_table_address_is_marked (start))
- ++remarked_cards;
+ ++cur_stats->remarked;
start += CARD_SIZE_IN_BYTES;
}
}
#endif
static void
-card_tables_collect_starts (gboolean begin)
+card_tables_collect_stats (gboolean begin)
{
#ifdef CARDTABLE_STATS
if (begin) {
- total_cards = marked_cards = remarked_cards = 0;
+ memset (&major_stats, 0, sizeof (card_stats));
+ memset (&los_stats, 0, sizeof (card_stats));
+ cur_stats = &major_stats;
major_collector.iterate_live_block_ranges (count_marked_cards);
- los_iterate_live_block_ranges (count_marked_cards);
+ cur_stats = &los_stats;
+ mono_sgen_los_iterate_live_block_ranges (count_marked_cards);
} else {
+ cur_stats = &major_stats;
major_collector.iterate_live_block_ranges (count_marked_cards);
- los_iterate_live_block_ranges (count_remarked_cards);
- printf ("cards total %d marked %d remarked %d\n", total_cards, marked_cards, remarked_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",
+ 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);
}
#endif
}
#define scan_from_card_tables(start,end,queue)
#define card_table_clear()
#define card_table_init()
-#define card_tables_collect_starts(begin)
+#define card_tables_collect_stats(begin)
guint8*
mono_gc_get_card_table (int *shift_bits, gpointer *mask)
projects / mono.git / blobdiff