X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mono%2Fsgen%2Fsgen-gc.c;h=4c3454823fdd42c2f5e0073a87f650601d6b84bf;hb=a7c9e39f0f58a1dcd41475f5623f301f14e31da7;hp=ed48b8eb66507c46d5a7003237ee1b68f6cb257d;hpb=57d7457da522af3ae0c61304ed0d97eca258258f;p=mono.git diff --git a/mono/sgen/sgen-gc.c b/mono/sgen/sgen-gc.c index ed48b8eb665..4c3454823fd 100644 --- a/mono/sgen/sgen-gc.c +++ b/mono/sgen/sgen-gc.c @@ -177,6 +177,7 @@ #include #include #include +#include #include "mono/sgen/sgen-gc.h" #include "mono/sgen/sgen-cardtable.h" @@ -194,6 +195,7 @@ #include #include +#include #undef pthread_create #undef pthread_join @@ -236,6 +238,9 @@ static gboolean do_dump_nursery_content = FALSE; static gboolean enable_nursery_canaries = FALSE; static gboolean precleaning_enabled = TRUE; +static gboolean dynamic_nursery = FALSE; +static size_t min_nursery_size = 0; +static size_t max_nursery_size = 0; #ifdef HEAVY_STATISTICS guint64 stat_objects_alloced_degraded = 0; @@ -279,7 +284,8 @@ static guint64 time_major_pre_collection_fragment_clear = 0; static guint64 time_major_pinning = 0; static guint64 time_major_scan_pinned = 0; static guint64 time_major_scan_roots = 0; -static guint64 time_major_scan_mod_union = 0; +static guint64 time_major_scan_mod_union_blocks = 0; +static guint64 time_major_scan_mod_union_los = 0; static guint64 time_major_finish_gray_stack = 0; static guint64 time_major_free_bigobjs = 0; static guint64 time_major_los_sweep = 0; @@ -288,8 +294,8 @@ static guint64 time_major_fragment_creation = 0; static guint64 time_max = 0; -static int sgen_max_pause_time = SGEN_MAX_PAUSE_TIME; -static float sgen_max_pause_margin = SGEN_MAX_PAUSE_MARGIN; +static int sgen_max_pause_time = SGEN_DEFAULT_MAX_PAUSE_TIME; +static float sgen_max_pause_margin = SGEN_DEFAULT_MAX_PAUSE_MARGIN; static SGEN_TV_DECLARE (time_major_conc_collection_start); static SGEN_TV_DECLARE (time_major_conc_collection_end); @@ -331,14 +337,26 @@ nursery_canaries_enabled (void) #define safe_object_get_size sgen_safe_object_get_size -#if defined(HAVE_CONC_GC_AS_DEFAULT) -/* Use concurrent major on deskstop platforms */ -#define DEFAULT_MAJOR_INIT sgen_marksweep_conc_init -#define DEFAULT_MAJOR_NAME "marksweep-conc" -#else -#define DEFAULT_MAJOR_INIT sgen_marksweep_init -#define DEFAULT_MAJOR_NAME "marksweep" -#endif +typedef enum { + SGEN_MAJOR_DEFAULT, + SGEN_MAJOR_SERIAL, + SGEN_MAJOR_CONCURRENT, + SGEN_MAJOR_CONCURRENT_PARALLEL +} SgenMajor; + +typedef enum { + SGEN_MINOR_DEFAULT, + SGEN_MINOR_SIMPLE, + SGEN_MINOR_SIMPLE_PARALLEL, + SGEN_MINOR_SPLIT +} SgenMinor; + +typedef enum { + SGEN_MODE_NONE, + SGEN_MODE_BALANCED, + SGEN_MODE_THROUGHPUT, + SGEN_MODE_PAUSE +} SgenMode; /* * ###################################################################### @@ -432,7 +450,7 @@ sgen_workers_get_job_gray_queue (WorkerData *worker_data, SgenGrayQueue *default static void gray_queue_redirect (SgenGrayQueue *queue) { - sgen_workers_take_from_queue (queue); + sgen_workers_take_from_queue (current_collection_generation, queue); } void @@ -1257,7 +1275,8 @@ init_stats (void) mono_counters_register ("Major pinning", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_pinning); mono_counters_register ("Major scan pinned", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_pinned); mono_counters_register ("Major scan roots", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_roots); - mono_counters_register ("Major scan mod union", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_mod_union); + mono_counters_register ("Major scan mod union blocks", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_mod_union_blocks); + mono_counters_register ("Major scan mod union los", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_scan_mod_union_los); mono_counters_register ("Major finish gray stack", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_finish_gray_stack); mono_counters_register ("Major free big objects", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_free_bigobjs); mono_counters_register ("Major LOS sweep", MONO_COUNTER_GC | MONO_COUNTER_ULONG | MONO_COUNTER_TIME, &time_major_los_sweep); @@ -1338,7 +1357,8 @@ typedef struct { typedef struct { ScanJob scan_job; - int job_index; + int job_index, job_split_count; + int data; } ParallelScanJob; static ScanCopyContext @@ -1353,7 +1373,7 @@ scan_copy_context_for_scan_job (void *worker_data_untyped, ScanJob *job) * object ops changes, like forced concurrent finish. */ SGEN_ASSERT (0, sgen_workers_is_worker_thread (mono_native_thread_id_get ()), "We need a context for the scan job"); - job->ops = sgen_workers_get_idle_func_object_ops (); + job->ops = sgen_workers_get_idle_func_object_ops (worker_data); } return CONTEXT_FROM_OBJECT_OPERATIONS (job->ops, sgen_workers_get_job_gray_queue (worker_data, job->gc_thread_gray_queue)); @@ -1422,9 +1442,12 @@ job_scan_major_card_table (void *worker_data_untyped, SgenThreadPoolJob *job) ScanCopyContext ctx = scan_copy_context_for_scan_job (worker_data_untyped, (ScanJob*)job_data); SGEN_TV_GETTIME (atv); - major_collector.scan_card_table (CARDTABLE_SCAN_GLOBAL, ctx, job_data->job_index, sgen_workers_get_job_split_count ()); + major_collector.scan_card_table (CARDTABLE_SCAN_GLOBAL, ctx, job_data->job_index, job_data->job_split_count, job_data->data); SGEN_TV_GETTIME (btv); time_minor_scan_major_blocks += SGEN_TV_ELAPSED (atv, btv); + + if (worker_data_untyped) + ((WorkerData*)worker_data_untyped)->major_scan_time += SGEN_TV_ELAPSED (atv, btv); } static void @@ -1436,51 +1459,82 @@ job_scan_los_card_table (void *worker_data_untyped, SgenThreadPoolJob *job) ScanCopyContext ctx = scan_copy_context_for_scan_job (worker_data_untyped, (ScanJob*)job_data); SGEN_TV_GETTIME (atv); - sgen_los_scan_card_table (CARDTABLE_SCAN_GLOBAL, ctx, job_data->job_index, sgen_workers_get_job_split_count ()); + sgen_los_scan_card_table (CARDTABLE_SCAN_GLOBAL, ctx, job_data->job_index, job_data->job_split_count); SGEN_TV_GETTIME (btv); time_minor_scan_los += SGEN_TV_ELAPSED (atv, btv); + + if (worker_data_untyped) + ((WorkerData*)worker_data_untyped)->los_scan_time += SGEN_TV_ELAPSED (atv, btv); } static void job_scan_major_mod_union_card_table (void *worker_data_untyped, SgenThreadPoolJob *job) { + SGEN_TV_DECLARE (atv); + SGEN_TV_DECLARE (btv); ParallelScanJob *job_data = (ParallelScanJob*)job; ScanCopyContext ctx = scan_copy_context_for_scan_job (worker_data_untyped, (ScanJob*)job_data); g_assert (concurrent_collection_in_progress); - major_collector.scan_card_table (CARDTABLE_SCAN_MOD_UNION, ctx, job_data->job_index, sgen_workers_get_job_split_count ()); + SGEN_TV_GETTIME (atv); + major_collector.scan_card_table (CARDTABLE_SCAN_MOD_UNION, ctx, job_data->job_index, job_data->job_split_count, job_data->data); + SGEN_TV_GETTIME (btv); + time_major_scan_mod_union_blocks += SGEN_TV_ELAPSED (atv, btv); + + if (worker_data_untyped) + ((WorkerData*)worker_data_untyped)->major_scan_time += SGEN_TV_ELAPSED (atv, btv); } static void job_scan_los_mod_union_card_table (void *worker_data_untyped, SgenThreadPoolJob *job) { + SGEN_TV_DECLARE (atv); + SGEN_TV_DECLARE (btv); ParallelScanJob *job_data = (ParallelScanJob*)job; ScanCopyContext ctx = scan_copy_context_for_scan_job (worker_data_untyped, (ScanJob*)job_data); g_assert (concurrent_collection_in_progress); - sgen_los_scan_card_table (CARDTABLE_SCAN_MOD_UNION, ctx, job_data->job_index, sgen_workers_get_job_split_count ()); + SGEN_TV_GETTIME (atv); + sgen_los_scan_card_table (CARDTABLE_SCAN_MOD_UNION, ctx, job_data->job_index, job_data->job_split_count); + SGEN_TV_GETTIME (btv); + time_major_scan_mod_union_los += SGEN_TV_ELAPSED (atv, btv); + + if (worker_data_untyped) + ((WorkerData*)worker_data_untyped)->los_scan_time += SGEN_TV_ELAPSED (atv, btv); } static void job_major_mod_union_preclean (void *worker_data_untyped, SgenThreadPoolJob *job) { + SGEN_TV_DECLARE (atv); + SGEN_TV_DECLARE (btv); ParallelScanJob *job_data = (ParallelScanJob*)job; ScanCopyContext ctx = scan_copy_context_for_scan_job (worker_data_untyped, (ScanJob*)job_data); g_assert (concurrent_collection_in_progress); + SGEN_TV_GETTIME (atv); + major_collector.scan_card_table (CARDTABLE_SCAN_MOD_UNION_PRECLEAN, ctx, job_data->job_index, job_data->job_split_count, job_data->data); + SGEN_TV_GETTIME (btv); - major_collector.scan_card_table (CARDTABLE_SCAN_MOD_UNION_PRECLEAN, ctx, job_data->job_index, sgen_workers_get_job_split_count ()); + g_assert (worker_data_untyped); + ((WorkerData*)worker_data_untyped)->major_scan_time += SGEN_TV_ELAPSED (atv, btv); } static void job_los_mod_union_preclean (void *worker_data_untyped, SgenThreadPoolJob *job) { + SGEN_TV_DECLARE (atv); + SGEN_TV_DECLARE (btv); ParallelScanJob *job_data = (ParallelScanJob*)job; ScanCopyContext ctx = scan_copy_context_for_scan_job (worker_data_untyped, (ScanJob*)job_data); g_assert (concurrent_collection_in_progress); + SGEN_TV_GETTIME (atv); + sgen_los_scan_card_table (CARDTABLE_SCAN_MOD_UNION_PRECLEAN, ctx, job_data->job_index, job_data->job_split_count); + SGEN_TV_GETTIME (btv); - sgen_los_scan_card_table (CARDTABLE_SCAN_MOD_UNION_PRECLEAN, ctx, job_data->job_index, sgen_workers_get_job_split_count ()); + g_assert (worker_data_untyped); + ((WorkerData*)worker_data_untyped)->los_scan_time += SGEN_TV_ELAPSED (atv, btv); } static void @@ -1499,46 +1553,49 @@ workers_finish_callback (void) { ParallelScanJob *psj; ScanJob *sj; - int split_count = sgen_workers_get_job_split_count (); + size_t num_major_sections = major_collector.get_num_major_sections (); + int split_count = sgen_workers_get_job_split_count (GENERATION_OLD); int i; /* Mod union preclean jobs */ for (i = 0; i < split_count; i++) { psj = (ParallelScanJob*)sgen_thread_pool_job_alloc ("preclean major mod union cardtable", job_major_mod_union_preclean, sizeof (ParallelScanJob)); psj->scan_job.gc_thread_gray_queue = NULL; psj->job_index = i; - sgen_workers_enqueue_job (&psj->scan_job.job, TRUE); + psj->job_split_count = split_count; + psj->data = num_major_sections / split_count; + sgen_workers_enqueue_job (GENERATION_OLD, &psj->scan_job.job, TRUE); } for (i = 0; i < split_count; i++) { psj = (ParallelScanJob*)sgen_thread_pool_job_alloc ("preclean los mod union cardtable", job_los_mod_union_preclean, sizeof (ParallelScanJob)); psj->scan_job.gc_thread_gray_queue = NULL; psj->job_index = i; - sgen_workers_enqueue_job (&psj->scan_job.job, TRUE); + psj->job_split_count = split_count; + sgen_workers_enqueue_job (GENERATION_OLD, &psj->scan_job.job, TRUE); } sj = (ScanJob*)sgen_thread_pool_job_alloc ("scan last pinned", job_scan_last_pinned, sizeof (ScanJob)); sj->gc_thread_gray_queue = NULL; - sgen_workers_enqueue_job (&sj->job, TRUE); + sgen_workers_enqueue_job (GENERATION_OLD, &sj->job, TRUE); } static void -init_gray_queue (SgenGrayQueue *gc_thread_gray_queue, gboolean use_workers) +init_gray_queue (SgenGrayQueue *gc_thread_gray_queue) { - if (use_workers) - sgen_workers_init_distribute_gray_queue (); sgen_gray_object_queue_init (gc_thread_gray_queue, NULL, TRUE); } static void enqueue_scan_remembered_set_jobs (SgenGrayQueue *gc_thread_gray_queue, SgenObjectOperations *ops, gboolean enqueue) { - int i, split_count = sgen_workers_get_job_split_count (); + int i, split_count = sgen_workers_get_job_split_count (GENERATION_NURSERY); + size_t num_major_sections = major_collector.get_num_major_sections (); ScanJob *sj; sj = (ScanJob*)sgen_thread_pool_job_alloc ("scan wbroots", job_scan_wbroots, sizeof (ScanJob)); sj->ops = ops; sj->gc_thread_gray_queue = gc_thread_gray_queue; - sgen_workers_enqueue_job (&sj->job, enqueue); + sgen_workers_enqueue_job (GENERATION_NURSERY, &sj->job, enqueue); for (i = 0; i < split_count; i++) { ParallelScanJob *psj; @@ -1547,13 +1604,16 @@ enqueue_scan_remembered_set_jobs (SgenGrayQueue *gc_thread_gray_queue, SgenObjec psj->scan_job.ops = ops; psj->scan_job.gc_thread_gray_queue = gc_thread_gray_queue; psj->job_index = i; - sgen_workers_enqueue_job (&psj->scan_job.job, enqueue); + psj->job_split_count = split_count; + psj->data = num_major_sections / split_count; + sgen_workers_enqueue_job (GENERATION_NURSERY, &psj->scan_job.job, enqueue); psj = (ParallelScanJob*)sgen_thread_pool_job_alloc ("scan LOS remsets", job_scan_los_card_table, sizeof (ParallelScanJob)); psj->scan_job.ops = ops; psj->scan_job.gc_thread_gray_queue = gc_thread_gray_queue; psj->job_index = i; - sgen_workers_enqueue_job (&psj->scan_job.job, enqueue); + psj->job_split_count = split_count; + sgen_workers_enqueue_job (GENERATION_NURSERY, &psj->scan_job.job, enqueue); } } @@ -1572,7 +1632,7 @@ enqueue_scan_from_roots_jobs (SgenGrayQueue *gc_thread_gray_queue, char *heap_st scrrj->heap_start = heap_start; scrrj->heap_end = heap_end; scrrj->root_type = ROOT_TYPE_NORMAL; - sgen_workers_enqueue_job (&scrrj->scan_job.job, enqueue); + sgen_workers_enqueue_job (current_collection_generation, &scrrj->scan_job.job, enqueue); if (current_collection_generation == GENERATION_OLD) { /* During minors we scan the cardtable for these roots instead */ @@ -1582,7 +1642,7 @@ enqueue_scan_from_roots_jobs (SgenGrayQueue *gc_thread_gray_queue, char *heap_st scrrj->heap_start = heap_start; scrrj->heap_end = heap_end; scrrj->root_type = ROOT_TYPE_WBARRIER; - sgen_workers_enqueue_job (&scrrj->scan_job.job, enqueue); + sgen_workers_enqueue_job (current_collection_generation, &scrrj->scan_job.job, enqueue); } /* Threads */ @@ -1592,7 +1652,7 @@ enqueue_scan_from_roots_jobs (SgenGrayQueue *gc_thread_gray_queue, char *heap_st stdj->scan_job.gc_thread_gray_queue = gc_thread_gray_queue; stdj->heap_start = heap_start; stdj->heap_end = heap_end; - sgen_workers_enqueue_job (&stdj->scan_job.job, enqueue); + sgen_workers_enqueue_job (current_collection_generation, &stdj->scan_job.job, enqueue); /* Scan the list of objects ready for finalization. */ @@ -1600,13 +1660,13 @@ enqueue_scan_from_roots_jobs (SgenGrayQueue *gc_thread_gray_queue, char *heap_st sfej->scan_job.ops = ops; sfej->scan_job.gc_thread_gray_queue = gc_thread_gray_queue; sfej->queue = &fin_ready_queue; - sgen_workers_enqueue_job (&sfej->scan_job.job, enqueue); + sgen_workers_enqueue_job (current_collection_generation, &sfej->scan_job.job, enqueue); sfej = (ScanFinalizerEntriesJob*)sgen_thread_pool_job_alloc ("scan critical finalizer entries", job_scan_finalizer_entries, sizeof (ScanFinalizerEntriesJob)); sfej->scan_job.ops = ops; sfej->scan_job.gc_thread_gray_queue = gc_thread_gray_queue; sfej->queue = &critical_fin_queue; - sgen_workers_enqueue_job (&sfej->scan_job.job, enqueue); + sgen_workers_enqueue_job (current_collection_generation, &sfej->scan_job.job, enqueue); } /* @@ -1622,11 +1682,13 @@ collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_ SgenGrayQueue gc_thread_gray_queue; SgenObjectOperations *object_ops_nopar, *object_ops_par = NULL; ScanCopyContext ctx; - int duration; TV_DECLARE (atv); TV_DECLARE (btv); SGEN_TV_DECLARE (last_minor_collection_start_tv); SGEN_TV_DECLARE (last_minor_collection_end_tv); + guint64 major_scan_start = time_minor_scan_major_blocks; + guint64 los_scan_start = time_minor_scan_los; + guint64 finish_gray_start = time_minor_finish_gray_stack; if (disable_minor_collections) return TRUE; @@ -1634,17 +1696,16 @@ collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_ TV_GETTIME (last_minor_collection_start_tv); atv = last_minor_collection_start_tv; - binary_protocol_collection_begin (gc_stats.minor_gc_count, GENERATION_NURSERY); + binary_protocol_collection_begin (InterlockedRead (&gc_stats.minor_gc_count), GENERATION_NURSERY); - if (sgen_concurrent_collection_in_progress ()) { - /* FIXME Support parallel nursery collections with concurrent major */ - object_ops_nopar = &sgen_minor_collector.serial_ops_with_concurrent_major; - } else { - object_ops_nopar = &sgen_minor_collector.serial_ops; - if (sgen_minor_collector.is_parallel) { - object_ops_par = &sgen_minor_collector.parallel_ops; - is_parallel = TRUE; - } + object_ops_nopar = sgen_concurrent_collection_in_progress () + ? &sgen_minor_collector.serial_ops_with_concurrent_major + : &sgen_minor_collector.serial_ops; + if (sgen_minor_collector.is_parallel && sgen_nursery_size >= SGEN_PARALLEL_MINOR_MIN_NURSERY_SIZE) { + object_ops_par = sgen_concurrent_collection_in_progress () + ? &sgen_minor_collector.parallel_ops_with_concurrent_major + : &sgen_minor_collector.parallel_ops; + is_parallel = TRUE; } if (do_verify_nursery || do_dump_nursery_content) @@ -1663,7 +1724,7 @@ collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_ degraded_mode = 0; objects_pinned = 0; - SGEN_LOG (1, "Start nursery collection %d %p-%p, size: %d", gc_stats.minor_gc_count, nursery_section->data, nursery_section->end_data, (int)(nursery_section->end_data - nursery_section->data)); + SGEN_LOG (1, "Start nursery collection %" G_GINT32_FORMAT " %p-%p, size: %d", InterlockedRead (&gc_stats.minor_gc_count), nursery_section->data, nursery_section->end_data, (int)(nursery_section->end_data - nursery_section->data)); /* world must be stopped already */ TV_GETTIME (btv); @@ -1675,15 +1736,17 @@ collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_ sgen_memgov_minor_collection_start (); - init_gray_queue (&gc_thread_gray_queue, is_parallel); + init_gray_queue (&gc_thread_gray_queue); ctx = CONTEXT_FROM_OBJECT_OPERATIONS (object_ops_nopar, &gc_thread_gray_queue); - gc_stats.minor_gc_count ++; + InterlockedIncrement (&gc_stats.minor_gc_count); sgen_process_fin_stage_entries (); /* pin from pinned handles */ sgen_init_pinning (); + if (concurrent_collection_in_progress) + sgen_init_pinning_for_conc (); sgen_client_binary_protocol_mark_start (GENERATION_NURSERY); pin_from_roots (nursery_section->data, nursery_section->end_data, ctx); /* pin cemented objects */ @@ -1694,6 +1757,8 @@ collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_ pin_objects_in_nursery (FALSE, ctx); sgen_pinning_trim_queue_to_section (nursery_section); + if (concurrent_collection_in_progress) + sgen_finish_pinning_for_conc (); if (remset_consistency_checks) sgen_check_remset_consistency (); @@ -1729,8 +1794,8 @@ collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_ if (is_parallel) { gray_queue_redirect (&gc_thread_gray_queue); - sgen_workers_start_all_workers (object_ops_nopar, object_ops_par, NULL); - sgen_workers_join (); + sgen_workers_start_all_workers (GENERATION_NURSERY, object_ops_nopar, object_ops_par, NULL); + sgen_workers_join (GENERATION_NURSERY); } TV_GETTIME (btv); @@ -1755,12 +1820,18 @@ collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_ sgen_check_remset_consistency (); - TV_GETTIME (btv); - duration = (int)(TV_ELAPSED (last_minor_collection_start_tv, btv) / 10000); - if (duration > (sgen_max_pause_time * sgen_max_pause_margin)) - sgen_resize_nursery (TRUE); - else - sgen_resize_nursery (FALSE); + if (sgen_max_pause_time) { + int duration; + + TV_GETTIME (btv); + duration = (int)(TV_ELAPSED (last_minor_collection_start_tv, btv) / 10000); + if (duration > (sgen_max_pause_time * sgen_max_pause_margin)) + sgen_resize_nursery (TRUE); + else + sgen_resize_nursery (FALSE); + } else { + sgen_resize_nursery (FALSE); + } /* walk the pin_queue, build up the fragment list of free memory, unmark * pinned objects as we go, memzero() the empty fragments so they are ready for the @@ -1785,9 +1856,9 @@ collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_ major_collector.finish_nursery_collection (); TV_GETTIME (last_minor_collection_end_tv); - gc_stats.minor_gc_time += TV_ELAPSED (last_minor_collection_start_tv, last_minor_collection_end_tv); + UnlockedAdd64 (&gc_stats.minor_gc_time, TV_ELAPSED (last_minor_collection_start_tv, last_minor_collection_end_tv)); - sgen_debug_dump_heap ("minor", gc_stats.minor_gc_count - 1, NULL); + sgen_debug_dump_heap ("minor", InterlockedRead (&gc_stats.minor_gc_count) - 1, NULL); /* prepare the pin queue for the next collection */ sgen_finish_pinning (); @@ -1812,7 +1883,15 @@ collect_nursery (const char *reason, gboolean is_overflow, SgenGrayQueue *unpin_ current_collection_generation = -1; objects_pinned = 0; - binary_protocol_collection_end (gc_stats.minor_gc_count - 1, GENERATION_NURSERY, 0, 0); + if (is_parallel) + binary_protocol_collection_end_stats (0, 0, time_minor_finish_gray_stack - finish_gray_start); + else + binary_protocol_collection_end_stats ( + time_minor_scan_major_blocks - major_scan_start, + time_minor_scan_los - los_scan_start, + time_minor_finish_gray_stack - finish_gray_start); + + binary_protocol_collection_end (InterlockedRead (&gc_stats.minor_gc_count) - 1, GENERATION_NURSERY, 0, 0); if (check_nursery_objects_pinned && !sgen_minor_collector.is_split) sgen_check_nursery_objects_pinned (unpin_queue != NULL); @@ -1877,6 +1956,8 @@ major_copy_or_mark_from_roots (SgenGrayQueue *gc_thread_gray_queue, size_t *old_ TV_GETTIME (atv); sgen_init_pinning (); + if (mode == COPY_OR_MARK_FROM_ROOTS_START_CONCURRENT) + sgen_init_pinning_for_conc (); SGEN_LOG (6, "Collecting pinned addresses"); pin_from_roots ((void*)lowest_heap_address, (void*)highest_heap_address, ctx); if (mode == COPY_OR_MARK_FROM_ROOTS_FINISH_CONCURRENT) { @@ -1947,20 +2028,26 @@ major_copy_or_mark_from_roots (SgenGrayQueue *gc_thread_gray_queue, size_t *old_ SGEN_LOG (2, "Finding pinned pointers: %zd in %lld usecs", sgen_get_pinned_count (), (long long)TV_ELAPSED (atv, btv)); SGEN_LOG (4, "Start scan with %zd pinned objects", sgen_get_pinned_count ()); + if (mode == COPY_OR_MARK_FROM_ROOTS_START_CONCURRENT) + sgen_finish_pinning_for_conc (); + major_collector.init_to_space (); SGEN_ASSERT (0, sgen_workers_all_done (), "Why are the workers not done when we start or finish a major collection?"); if (mode == COPY_OR_MARK_FROM_ROOTS_FINISH_CONCURRENT) { if (object_ops_par != NULL) - sgen_workers_set_num_active_workers (0); - if (sgen_workers_have_idle_work ()) { + sgen_workers_set_num_active_workers (GENERATION_OLD, 0); + if (object_ops_par == NULL && sgen_workers_have_idle_work (GENERATION_OLD)) { /* * We force the finish of the worker with the new object ops context - * which can also do copying. We need to have finished pinning. + * which can also do copying. We need to have finished pinning. On the + * parallel collector, there is no need to drain the private queues + * here, since we can do it as part of the finishing work, achieving + * better work distribution. */ - sgen_workers_start_all_workers (object_ops_nopar, object_ops_par, NULL); + sgen_workers_start_all_workers (GENERATION_OLD, object_ops_nopar, object_ops_par, NULL); - sgen_workers_join (); + sgen_workers_join (GENERATION_OLD); } } @@ -1986,17 +2073,18 @@ major_copy_or_mark_from_roots (SgenGrayQueue *gc_thread_gray_queue, size_t *old_ * the roots. */ if (mode == COPY_OR_MARK_FROM_ROOTS_START_CONCURRENT) { - sgen_workers_set_num_active_workers (1); + sgen_workers_set_num_active_workers (GENERATION_OLD, 1); gray_queue_redirect (gc_thread_gray_queue); if (precleaning_enabled) { - sgen_workers_start_all_workers (object_ops_nopar, object_ops_par, workers_finish_callback); + sgen_workers_start_all_workers (GENERATION_OLD, object_ops_nopar, object_ops_par, workers_finish_callback); } else { - sgen_workers_start_all_workers (object_ops_nopar, object_ops_par, NULL); + sgen_workers_start_all_workers (GENERATION_OLD, object_ops_nopar, object_ops_par, NULL); } } if (mode == COPY_OR_MARK_FROM_ROOTS_FINISH_CONCURRENT) { - int i, split_count = sgen_workers_get_job_split_count (); + int i, split_count = sgen_workers_get_job_split_count (GENERATION_OLD); + size_t num_major_sections = major_collector.get_num_major_sections (); gboolean parallel = object_ops_par != NULL; /* If we're not parallel we finish the collection on the gc thread */ @@ -2011,13 +2099,16 @@ major_copy_or_mark_from_roots (SgenGrayQueue *gc_thread_gray_queue, size_t *old_ psj->scan_job.ops = parallel ? NULL : object_ops_nopar; psj->scan_job.gc_thread_gray_queue = gc_thread_gray_queue; psj->job_index = i; - sgen_workers_enqueue_job (&psj->scan_job.job, parallel); + psj->job_split_count = split_count; + psj->data = num_major_sections / split_count; + sgen_workers_enqueue_job (GENERATION_OLD, &psj->scan_job.job, parallel); psj = (ParallelScanJob*)sgen_thread_pool_job_alloc ("scan LOS mod union cardtable", job_scan_los_mod_union_card_table, sizeof (ParallelScanJob)); psj->scan_job.ops = parallel ? NULL : object_ops_nopar; psj->scan_job.gc_thread_gray_queue = gc_thread_gray_queue; psj->job_index = i; - sgen_workers_enqueue_job (&psj->scan_job.job, parallel); + psj->job_split_count = split_count; + sgen_workers_enqueue_job (GENERATION_OLD, &psj->scan_job.job, parallel); } if (parallel) { @@ -2029,8 +2120,8 @@ major_copy_or_mark_from_roots (SgenGrayQueue *gc_thread_gray_queue, size_t *old_ * stack that contained roots and pinned objects and also scan the mod union card * table. */ - sgen_workers_start_all_workers (object_ops_nopar, object_ops_par, NULL); - sgen_workers_join (); + sgen_workers_start_all_workers (GENERATION_OLD, object_ops_nopar, object_ops_par, NULL); + sgen_workers_join (GENERATION_OLD); } } @@ -2051,11 +2142,11 @@ major_start_collection (SgenGrayQueue *gc_thread_gray_queue, const char *reason, { SgenObjectOperations *object_ops_nopar, *object_ops_par = NULL; - binary_protocol_collection_begin (gc_stats.major_gc_count, GENERATION_OLD); + binary_protocol_collection_begin (InterlockedRead (&gc_stats.major_gc_count), GENERATION_OLD); current_collection_generation = GENERATION_OLD; - sgen_workers_assert_gray_queue_is_empty (); + sgen_workers_assert_gray_queue_is_empty (GENERATION_OLD); if (!concurrent) sgen_cement_reset (); @@ -2082,8 +2173,8 @@ major_start_collection (SgenGrayQueue *gc_thread_gray_queue, const char *reason, check_scan_starts (); degraded_mode = 0; - SGEN_LOG (1, "Start major collection %d", gc_stats.major_gc_count); - gc_stats.major_gc_count ++; + SGEN_LOG (1, "Start major collection %" G_GINT32_FORMAT, InterlockedRead (&gc_stats.major_gc_count)); + InterlockedIncrement (&gc_stats.major_gc_count); if (major_collector.start_major_collection) major_collector.start_major_collection (); @@ -2099,8 +2190,9 @@ major_finish_collection (SgenGrayQueue *gc_thread_gray_queue, const char *reason mword fragment_total; TV_DECLARE (atv); TV_DECLARE (btv); - - TV_GETTIME (btv); + guint64 major_scan_start = time_major_scan_mod_union_blocks; + guint64 los_scan_start = time_major_scan_mod_union_los; + guint64 finish_gray_start = time_major_finish_gray_stack; if (concurrent_collection_in_progress) { SgenObjectOperations *object_ops_par = NULL; @@ -2118,8 +2210,9 @@ major_finish_collection (SgenGrayQueue *gc_thread_gray_queue, const char *reason object_ops_nopar = &major_collector.major_ops_serial; } - sgen_workers_assert_gray_queue_is_empty (); + sgen_workers_assert_gray_queue_is_empty (GENERATION_OLD); + TV_GETTIME (btv); finish_gray_stack (GENERATION_OLD, CONTEXT_FROM_OBJECT_OPERATIONS (object_ops_nopar, gc_thread_gray_queue)); TV_GETTIME (atv); time_major_finish_gray_stack += TV_ELAPSED (btv, atv); @@ -2197,7 +2290,7 @@ major_finish_collection (SgenGrayQueue *gc_thread_gray_queue, const char *reason TV_GETTIME (atv); time_major_sweep += TV_ELAPSED (btv, atv); - sgen_debug_dump_heap ("major", gc_stats.major_gc_count - 1, reason); + sgen_debug_dump_heap ("major", InterlockedRead (&gc_stats.major_gc_count) - 1, reason); if (sgen_have_pending_finalizers ()) { SGEN_LOG (4, "Finalizer-thread wakeup"); @@ -2210,7 +2303,7 @@ major_finish_collection (SgenGrayQueue *gc_thread_gray_queue, const char *reason memset (&counts, 0, sizeof (ScannedObjectCounts)); major_collector.finish_major_collection (&counts); - sgen_workers_assert_gray_queue_is_empty (); + sgen_workers_assert_gray_queue_is_empty (GENERATION_OLD); SGEN_ASSERT (0, sgen_workers_all_done (), "Can't have workers working after major collection has finished"); if (concurrent_collection_in_progress) @@ -2221,8 +2314,15 @@ major_finish_collection (SgenGrayQueue *gc_thread_gray_queue, const char *reason binary_protocol_flush_buffers (FALSE); //consistency_check (); + if (major_collector.is_parallel) + binary_protocol_collection_end_stats (0, 0, time_major_finish_gray_stack - finish_gray_start); + else + binary_protocol_collection_end_stats ( + time_major_scan_mod_union_blocks - major_scan_start, + time_major_scan_mod_union_los - los_scan_start, + time_major_finish_gray_stack - finish_gray_start); - binary_protocol_collection_end (gc_stats.major_gc_count - 1, GENERATION_OLD, counts.num_scanned_objects, counts.num_unique_scanned_objects); + binary_protocol_collection_end (InterlockedRead (&gc_stats.major_gc_count) - 1, GENERATION_OLD, counts.num_scanned_objects, counts.num_unique_scanned_objects); } static gboolean @@ -2244,13 +2344,13 @@ major_do_collection (const char *reason, gboolean is_overflow, gboolean forced) /* world must be stopped already */ TV_GETTIME (time_start); - init_gray_queue (&gc_thread_gray_queue, FALSE); + init_gray_queue (&gc_thread_gray_queue); major_start_collection (&gc_thread_gray_queue, reason, FALSE, &old_next_pin_slot); major_finish_collection (&gc_thread_gray_queue, reason, is_overflow, old_next_pin_slot, forced); sgen_gray_object_queue_dispose (&gc_thread_gray_queue); TV_GETTIME (time_end); - gc_stats.major_gc_time += TV_ELAPSED (time_start, time_end); + UnlockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (time_start, time_end)); /* FIXME: also report this to the user, preferably in gc-end. */ if (major_collector.get_and_reset_num_major_objects_marked) @@ -2278,7 +2378,7 @@ major_start_concurrent_collection (const char *reason) binary_protocol_concurrent_start (); - init_gray_queue (&gc_thread_gray_queue, TRUE); + init_gray_queue (&gc_thread_gray_queue); // FIXME: store reason and pass it when finishing major_start_collection (&gc_thread_gray_queue, reason, TRUE, NULL); sgen_gray_object_queue_dispose (&gc_thread_gray_queue); @@ -2286,7 +2386,7 @@ major_start_concurrent_collection (const char *reason) num_objects_marked = major_collector.get_and_reset_num_major_objects_marked (); TV_GETTIME (time_end); - gc_stats.major_gc_time += TV_ELAPSED (time_start, time_end); + UnlockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (time_start, time_end)); current_collection_generation = -1; } @@ -2314,7 +2414,7 @@ major_update_concurrent_collection (void) sgen_los_update_cardtable_mod_union (); TV_GETTIME (total_end); - gc_stats.major_gc_time += TV_ELAPSED (total_start, total_end); + UnlockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (total_start, total_end)); } static void @@ -2333,10 +2433,10 @@ major_finish_concurrent_collection (gboolean forced) * The workers will be resumed with a finishing pause context to avoid * additional cardtable and object scanning. */ - sgen_workers_stop_all_workers (); + sgen_workers_stop_all_workers (GENERATION_OLD); SGEN_TV_GETTIME (time_major_conc_collection_end); - gc_stats.major_gc_time_concurrent += SGEN_TV_ELAPSED (time_major_conc_collection_start, time_major_conc_collection_end); + UnlockedAdd64 (&gc_stats.major_gc_time_concurrent, SGEN_TV_ELAPSED (time_major_conc_collection_start, time_major_conc_collection_end)); major_collector.update_cardtable_mod_union (); sgen_los_update_cardtable_mod_union (); @@ -2346,12 +2446,12 @@ major_finish_concurrent_collection (gboolean forced) current_collection_generation = GENERATION_OLD; sgen_cement_reset (); - init_gray_queue (&gc_thread_gray_queue, FALSE); + init_gray_queue (&gc_thread_gray_queue); major_finish_collection (&gc_thread_gray_queue, "finishing", FALSE, -1, forced); sgen_gray_object_queue_dispose (&gc_thread_gray_queue); TV_GETTIME (total_end); - gc_stats.major_gc_time += TV_ELAPSED (total_start, total_end); + UnlockedAdd64 (&gc_stats.major_gc_time, TV_ELAPSED (total_start, total_end)); current_collection_generation = -1; } @@ -2403,7 +2503,7 @@ sgen_ensure_free_space (size_t size, int generation) * LOCKING: Assumes the GC lock is held. */ void -sgen_perform_collection (size_t requested_size, int generation_to_collect, const char *reason, gboolean wait_to_finish, gboolean stw) +sgen_perform_collection_inner (size_t requested_size, int generation_to_collect, const char *reason, gboolean wait_to_finish, gboolean stw) { TV_DECLARE (gc_total_start); TV_DECLARE (gc_total_end); @@ -2482,6 +2582,52 @@ sgen_perform_collection (size_t requested_size, int generation_to_collect, const sgen_restart_world (oldest_generation_collected); } +#ifdef HOST_WASM + +typedef struct { + size_t requested_size; + int generation_to_collect; + const char *reason; +} SgenGcRequest; + +static SgenGcRequest gc_request; +static gboolean pending_request; + +extern void request_gc_cycle (void); + +#include + +EMSCRIPTEN_KEEPALIVE void +mono_gc_pump_callback (void) +{ + if (!pending_request) + return; + pending_request = FALSE; + sgen_perform_collection_inner (gc_request.requested_size, gc_request.generation_to_collect, gc_request.reason, TRUE, TRUE); +} +#endif + +void +sgen_perform_collection (size_t requested_size, int generation_to_collect, const char *reason, gboolean wait_to_finish, gboolean stw) +{ +#ifdef HOST_WASM + g_assert (stw); //can't handle non-stw mode (IE, domain unload) + //we ignore wait_to_finish + if (!pending_request || gc_request.generation_to_collect <= generation_to_collect) { //no active request or request was for a smaller part of the heap + gc_request.requested_size = requested_size; + gc_request.generation_to_collect = generation_to_collect; + gc_request.reason = reason; + if (!pending_request) { + request_gc_cycle (); + pending_request = TRUE; + } + } + + degraded_mode = 1; //enable degraded mode so allocation can continue +#else + sgen_perform_collection_inner (requested_size, generation_to_collect, reason, wait_to_finish, stw); +#endif +} /* * ###################################################################### * ######## Memory allocation from the OS @@ -2804,19 +2950,19 @@ sgen_get_current_collection_generation (void) } void* -sgen_thread_register (SgenThreadInfo* info, void *stack_bottom_fallback) +sgen_thread_attach (SgenThreadInfo* info) { info->tlab_start = info->tlab_next = info->tlab_temp_end = info->tlab_real_end = NULL; - sgen_client_thread_register (info, stack_bottom_fallback); + sgen_client_thread_attach (info); return info; } void -sgen_thread_unregister (SgenThreadInfo *p) +sgen_thread_detach_with_lock (SgenThreadInfo *p) { - sgen_client_thread_unregister (p); + sgen_client_thread_detach_with_lock (p); } /* @@ -2948,9 +3094,7 @@ sgen_gc_collect (int generation) int sgen_gc_collection_count (int generation) { - if (generation == 0) - return gc_stats.minor_gc_count; - return gc_stats.major_gc_count; + return InterlockedRead (generation == GENERATION_NURSERY ? &gc_stats.minor_gc_count : &gc_stats.major_gc_count); } size_t @@ -2999,13 +3143,161 @@ parse_double_in_interval (const char *env_var, const char *opt_name, const char return TRUE; } +static SgenMinor +parse_sgen_minor (const char *opt) +{ + if (!opt) + return SGEN_MINOR_DEFAULT; + + if (!strcmp (opt, "simple")) { + return SGEN_MINOR_SIMPLE; + } else if (!strcmp (opt, "simple-par")) { + return SGEN_MINOR_SIMPLE_PARALLEL; + } else if (!strcmp (opt, "split")) { + return SGEN_MINOR_SPLIT; + } else { + sgen_env_var_error (MONO_GC_PARAMS_NAME, "Using default instead.", "Unknown minor collector `%s'.", opt); + return SGEN_MINOR_DEFAULT; + } +} + +static SgenMajor +parse_sgen_major (const char *opt) +{ + if (!opt) + return SGEN_MAJOR_DEFAULT; + + if (!strcmp (opt, "marksweep")) { + return SGEN_MAJOR_SERIAL; + } else if (!strcmp (opt, "marksweep-conc")) { + return SGEN_MAJOR_CONCURRENT; + } else if (!strcmp (opt, "marksweep-conc-par")) { + return SGEN_MAJOR_CONCURRENT_PARALLEL; + } else { + sgen_env_var_error (MONO_GC_PARAMS_NAME, "Using default instead.", "Unknown major collector `%s'.", opt); + return SGEN_MAJOR_DEFAULT; + } + +} + +static SgenMode +parse_sgen_mode (const char *opt) +{ + if (!opt) + return SGEN_MODE_NONE; + + if (!strcmp (opt, "balanced")) { + return SGEN_MODE_BALANCED; + } else if (!strcmp (opt, "throughput")) { + return SGEN_MODE_THROUGHPUT; + } else if (!strcmp (opt, "pause") || g_str_has_prefix (opt, "pause:")) { + return SGEN_MODE_PAUSE; + } else { + sgen_env_var_error (MONO_GC_PARAMS_NAME, "Using default configurations.", "Unknown mode `%s'.", opt); + return SGEN_MODE_NONE; + } +} + +static void +init_sgen_minor (SgenMinor minor) +{ + switch (minor) { + case SGEN_MINOR_DEFAULT: + case SGEN_MINOR_SIMPLE: + sgen_simple_nursery_init (&sgen_minor_collector, FALSE); + break; + case SGEN_MINOR_SIMPLE_PARALLEL: + sgen_simple_nursery_init (&sgen_minor_collector, TRUE); + break; + case SGEN_MINOR_SPLIT: + sgen_split_nursery_init (&sgen_minor_collector); + break; + default: + g_assert_not_reached (); + } +} + +static void +init_sgen_major (SgenMajor major) +{ + if (major == SGEN_MAJOR_DEFAULT) + major = DEFAULT_MAJOR; + + switch (major) { + case SGEN_MAJOR_SERIAL: + sgen_marksweep_init (&major_collector); + break; + case SGEN_MAJOR_CONCURRENT: + sgen_marksweep_conc_init (&major_collector); + break; + case SGEN_MAJOR_CONCURRENT_PARALLEL: + sgen_marksweep_conc_par_init (&major_collector); + break; + default: + g_assert_not_reached (); + } +} + +/* + * If sgen mode is set, major/minor configuration is fixed. The other gc_params + * are parsed and processed after major/minor initialization, so it can potentially + * override some knobs set by the sgen mode. We can consider locking out additional + * configurations when gc_modes are used. + */ +static void +init_sgen_mode (SgenMode mode) +{ + SgenMinor minor = SGEN_MINOR_DEFAULT; + SgenMajor major = SGEN_MAJOR_DEFAULT; + + switch (mode) { + case SGEN_MODE_BALANCED: + /* + * Use a dynamic parallel nursery with a major concurrent collector. + * This uses the default values for max pause time and nursery size. + */ + minor = SGEN_MINOR_SIMPLE; + major = SGEN_MAJOR_CONCURRENT; + dynamic_nursery = TRUE; + break; + case SGEN_MODE_THROUGHPUT: + /* + * Use concurrent major to let the mutator do more work. Use a larger + * nursery, without pause time constraints, in order to collect more + * objects in parallel and avoid repetitive collection tasks (pinning, + * root scanning etc) + */ + minor = SGEN_MINOR_SIMPLE_PARALLEL; + major = SGEN_MAJOR_CONCURRENT; + dynamic_nursery = TRUE; + sgen_max_pause_time = 0; + break; + case SGEN_MODE_PAUSE: + /* + * Use concurrent major and dynamic nursery with a more + * aggressive shrinking relative to pause times. + */ + minor = SGEN_MINOR_SIMPLE_PARALLEL; + major = SGEN_MAJOR_CONCURRENT; + dynamic_nursery = TRUE; + sgen_max_pause_margin = SGEN_PAUSE_MODE_MAX_PAUSE_MARGIN; + break; + default: + g_assert_not_reached (); + } + + init_sgen_minor (minor); + init_sgen_major (major); +} + void sgen_gc_init (void) { char *env; char **opts, **ptr; - char *major_collector_opt = NULL; - char *minor_collector_opt = NULL; + SgenMajor sgen_major = SGEN_MAJOR_DEFAULT; + SgenMinor sgen_minor = SGEN_MINOR_DEFAULT; + SgenMode sgen_mode = SGEN_MODE_NONE; char *params_opts = NULL; char *debug_opts = NULL; size_t max_heap = 0; @@ -3014,8 +3306,6 @@ sgen_gc_init (void) gboolean debug_print_allowance = FALSE; double allowance_ratio = 0, save_target = 0; gboolean cement_enabled = TRUE; - gboolean dynamic_nursery = FALSE; - size_t min_nursery_size = 0, max_nursery_size = 0; do { result = InterlockedCompareExchange (&gc_initialized, -1, 0); @@ -3058,10 +3348,13 @@ sgen_gc_init (void) char *opt = *ptr; if (g_str_has_prefix (opt, "major=")) { opt = strchr (opt, '=') + 1; - major_collector_opt = g_strdup (opt); + sgen_major = parse_sgen_major (opt); } else if (g_str_has_prefix (opt, "minor=")) { opt = strchr (opt, '=') + 1; - minor_collector_opt = g_strdup (opt); + sgen_minor = parse_sgen_minor (opt); + } else if (g_str_has_prefix (opt, "mode=")) { + opt = strchr (opt, '=') + 1; + sgen_mode = parse_sgen_mode (opt); } } } else { @@ -3083,34 +3376,13 @@ sgen_gc_init (void) sgen_client_init (); - if (!minor_collector_opt) { - sgen_simple_nursery_init (&sgen_minor_collector, FALSE); - } else { - if (!strcmp (minor_collector_opt, "simple")) { - use_simple_nursery: - sgen_simple_nursery_init (&sgen_minor_collector, FALSE); - } else if (!strcmp (minor_collector_opt, "simple-par")) { - sgen_simple_nursery_init (&sgen_minor_collector, TRUE); - } else if (!strcmp (minor_collector_opt, "split")) { - sgen_split_nursery_init (&sgen_minor_collector); - } else { - sgen_env_var_error (MONO_GC_PARAMS_NAME, "Using `simple` instead.", "Unknown minor collector `%s'.", minor_collector_opt); - goto use_simple_nursery; - } - } - - if (!major_collector_opt) { - use_default_major: - DEFAULT_MAJOR_INIT (&major_collector); - } else if (!strcmp (major_collector_opt, "marksweep")) { - sgen_marksweep_init (&major_collector); - } else if (!strcmp (major_collector_opt, "marksweep-conc")) { - sgen_marksweep_conc_init (&major_collector); - } else if (!strcmp (major_collector_opt, "marksweep-conc-par")) { - sgen_marksweep_conc_par_init (&major_collector); + if (sgen_mode != SGEN_MODE_NONE) { + if (sgen_minor != SGEN_MINOR_DEFAULT || sgen_major != SGEN_MAJOR_DEFAULT) + sgen_env_var_error (MONO_GC_PARAMS_NAME, "Ignoring major/minor configuration", "Major/minor configurations cannot be used with sgen modes"); + init_sgen_mode (sgen_mode); } else { - sgen_env_var_error (MONO_GC_PARAMS_NAME, "Using `" DEFAULT_MAJOR_NAME "` instead.", "Unknown major collector `%s'.", major_collector_opt); - goto use_default_major; + init_sgen_minor (sgen_minor); + init_sgen_major (sgen_major); } if (opts) { @@ -3124,6 +3396,17 @@ sgen_gc_init (void) continue; if (g_str_has_prefix (opt, "minor=")) continue; + if (g_str_has_prefix (opt, "mode=")) { + if (g_str_has_prefix (opt, "mode=pause:")) { + char *str_pause = strchr (opt, ':') + 1; + int pause = atoi (str_pause); + if (pause) + sgen_max_pause_time = pause; + else + sgen_env_var_error (MONO_GC_PARAMS_NAME, "Using default", "Invalid maximum pause time for `pause` sgen mode"); + } + continue; + } if (g_str_has_prefix (opt, "max-heap-size=")) { size_t page_size = mono_pagesize (); size_t max_heap_candidate = 0; @@ -3239,6 +3522,7 @@ sgen_gc_init (void) fprintf (stderr, "\n%s must be a comma-delimited list of one or more of the following:\n", MONO_GC_PARAMS_NAME); fprintf (stderr, " max-heap-size=N (where N is an integer, possibly with a k, m or a g suffix)\n"); fprintf (stderr, " soft-heap-limit=n (where N is an integer, possibly with a k, m or a g suffix)\n"); + fprintf (stderr, " mode=MODE (where MODE is 'balanced', 'throughput' or 'pause[:N]' and N is maximum pause in milliseconds)\n"); fprintf (stderr, " nursery-size=N (where N is an integer, possibly with a k, m or a g suffix)\n"); fprintf (stderr, " major=COLLECTOR (where COLLECTOR is `marksweep', `marksweep-conc', `marksweep-par')\n"); fprintf (stderr, " minor=COLLECTOR (where COLLECTOR is `simple' or `split')\n"); @@ -3260,12 +3544,6 @@ sgen_gc_init (void) g_strfreev (opts); } - if (major_collector_opt) - g_free (major_collector_opt); - - if (minor_collector_opt) - g_free (minor_collector_opt); - if (params_opts) g_free (params_opts); @@ -3432,15 +3710,7 @@ sgen_gc_init (void) if (major_collector.post_param_init) major_collector.post_param_init (&major_collector); - if (major_collector.is_concurrent || sgen_minor_collector.is_parallel) { - int num_workers = 1; - if (major_collector.is_parallel || sgen_minor_collector.is_parallel) { - num_workers = mono_cpu_count (); - if (num_workers < 1) - num_workers = 1; - } - sgen_workers_init (num_workers, (SgenWorkerCallback) major_collector.worker_init_cb); - } + sgen_thread_pool_start (); sgen_memgov_init (max_heap, soft_limit, debug_print_allowance, allowance_ratio, save_target);