Merge pull request #2798 from BrzVlad/fix-sgen-timestamp

[sgen] Fix sgen binary protocol timestamp

TV_ELAPSED was cast to long instead of gint64, overflowing on some platforms.

diff --combined mono/sgen/sgen-gc.c
index e4d787a8bc85eb4c2f5867db98e062a0acd2f075,8d9534d57885e6b0cb1f24ae24da4feaedd5baa9..b91a9f4394884ed873958efc931b1d57aee7c1a8
--- 1/mono/sgen/sgen-gc.c
--- 2/mono/sgen/sgen-gc.c
+++ b/mono/sgen/sgen-gc.c
@@@ -245,8 -245,6 +245,8 @@@ static gboolean do_verify_nursery = FAL
  static gboolean do_dump_nursery_content = FALSE;
  static gboolean enable_nursery_canaries = FALSE;
  
 +static gboolean precleaning_enabled = TRUE;
 +
  #ifdef HEAVY_STATISTICS
  guint64 stat_objects_alloced_degraded = 0;
  guint64 stat_bytes_alloced_degraded = 0;
@@@ -1169,7 -1167,7 +1169,7 @@@ finish_gray_stack (int generation, Scan
        sgen_client_clear_togglerefs (start_addr, end_addr, ctx);
  
        TV_GETTIME (btv);
-       SGEN_LOG (2, "Finalize queue handling scan for %s generation: %ld usecs %d ephemeron rounds", generation_name (generation), TV_ELAPSED (atv, btv), ephemeron_rounds);
+       SGEN_LOG (2, "Finalize queue handling scan for %s generation: %lld usecs %d ephemeron rounds", generation_name (generation), TV_ELAPSED (atv, btv), ephemeron_rounds);
  
        /*
         * handle disappearing links
@@@ -1394,7 -1392,7 +1394,7 @@@ job_scan_major_mod_union_card_table (vo
        ScanCopyContext ctx = CONTEXT_FROM_OBJECT_OPERATIONS (job_data->ops, sgen_workers_get_job_gray_queue (worker_data));
  
        g_assert (concurrent_collection_in_progress);
 -      major_collector.scan_card_table (TRUE, ctx);
 +      major_collector.scan_card_table (CARDTABLE_SCAN_MOD_UNION, ctx);
  }
  
  static void
@@@ -1405,20 -1403,7 +1405,20 @@@ job_scan_los_mod_union_card_table (voi
        ScanCopyContext ctx = CONTEXT_FROM_OBJECT_OPERATIONS (job_data->ops, sgen_workers_get_job_gray_queue (worker_data));
  
        g_assert (concurrent_collection_in_progress);
 -      sgen_los_scan_card_table (TRUE, ctx);
 +      sgen_los_scan_card_table (CARDTABLE_SCAN_MOD_UNION, ctx);
 +}
 +
 +static void
 +job_mod_union_preclean (void *worker_data_untyped, SgenThreadPoolJob *job)
 +{
 +      WorkerData *worker_data = (WorkerData *)worker_data_untyped;
 +      ScanJob *job_data = (ScanJob*)job;
 +      ScanCopyContext ctx = CONTEXT_FROM_OBJECT_OPERATIONS (job_data->ops, sgen_workers_get_job_gray_queue (worker_data));
 +
 +      g_assert (concurrent_collection_in_progress);
 +
 +      major_collector.scan_card_table (CARDTABLE_SCAN_MOD_UNION_PRECLEAN, ctx);
 +      sgen_los_scan_card_table (CARDTABLE_SCAN_MOD_UNION_PRECLEAN, ctx);
  }
  
  static void
@@@ -1561,7 -1546,7 +1561,7 @@@ collect_nursery (SgenGrayQueue *unpin_q
  
        TV_GETTIME (atv);
        time_minor_pinning += TV_ELAPSED (btv, atv);
-       SGEN_LOG (2, "Finding pinned pointers: %zd in %ld usecs", sgen_get_pinned_count (), TV_ELAPSED (btv, atv));
+       SGEN_LOG (2, "Finding pinned pointers: %zd in %lld usecs", sgen_get_pinned_count (), TV_ELAPSED (btv, atv));
        SGEN_LOG (4, "Start scan with %zd pinned objects", sgen_get_pinned_count ());
  
        sj = (ScanJob*)sgen_thread_pool_job_alloc ("scan remset", job_remembered_set_scan, sizeof (ScanJob));
@@@ -1571,7 -1556,7 +1571,7 @@@
        /* we don't have complete write barrier yet, so we scan all the old generation sections */
        TV_GETTIME (btv);
        time_minor_scan_remsets += TV_ELAPSED (atv, btv);
-       SGEN_LOG (2, "Old generation scan: %ld usecs", TV_ELAPSED (atv, btv));
+       SGEN_LOG (2, "Old generation scan: %lld usecs", TV_ELAPSED (atv, btv));
  
        sgen_pin_stats_print_class_stats ();
  
@@@ -1612,7 -1597,7 +1612,7 @@@
        sgen_client_binary_protocol_reclaim_end (GENERATION_NURSERY);
        TV_GETTIME (btv);
        time_minor_fragment_creation += TV_ELAPSED (atv, btv);
-       SGEN_LOG (2, "Fragment creation: %ld usecs, %lu bytes available", TV_ELAPSED (atv, btv), (unsigned long)fragment_total);
+       SGEN_LOG (2, "Fragment creation: %lld usecs, %lu bytes available", TV_ELAPSED (atv, btv), (unsigned long)fragment_total);
  
        if (consistency_check_at_minor_collection)
                sgen_check_major_refs ();
@@@ -1777,12 -1762,11 +1777,12 @@@ major_copy_or_mark_from_roots (size_t *
  
        TV_GETTIME (btv);
        time_major_pinning += TV_ELAPSED (atv, btv);
-       SGEN_LOG (2, "Finding pinned pointers: %zd in %ld usecs", sgen_get_pinned_count (), TV_ELAPSED (atv, btv));
+       SGEN_LOG (2, "Finding pinned pointers: %zd in %lld usecs", sgen_get_pinned_count (), TV_ELAPSED (atv, btv));
        SGEN_LOG (4, "Start scan with %zd pinned objects", sgen_get_pinned_count ());
  
        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?");
        /*
         * The concurrent collector doesn't move objects, neither on
         * the major heap nor in the nursery, so we can mark even
@@@ -1790,19 -1774,12 +1790,19 @@@
         * collector we start the workers after pinning.
         */
        if (mode == COPY_OR_MARK_FROM_ROOTS_START_CONCURRENT) {
 -              SGEN_ASSERT (0, sgen_workers_all_done (), "Why are the workers not done when we start or finish a major collection?");
 -              sgen_workers_start_all_workers (object_ops);
 +              if (precleaning_enabled) {
 +                      ScanJob *sj;
 +                      /* Mod union preclean job */
 +                      sj = (ScanJob*)sgen_thread_pool_job_alloc ("preclean mod union cardtable", job_mod_union_preclean, sizeof (ScanJob));
 +                      sj->ops = object_ops;
 +                      sgen_workers_start_all_workers (object_ops, &sj->job);
 +              } else {
 +                      sgen_workers_start_all_workers (object_ops, NULL);
 +              }
                gray_queue_enable_redirect (WORKERS_DISTRIBUTE_GRAY_QUEUE);
        } else if (mode == COPY_OR_MARK_FROM_ROOTS_FINISH_CONCURRENT) {
                if (sgen_workers_have_idle_work ()) {
 -                      sgen_workers_start_all_workers (object_ops);
 +                      sgen_workers_start_all_workers (object_ops, NULL);
                        sgen_workers_join ();
                }
        }
@@@ -2954,15 -2931,6 +2954,15 @@@ sgen_gc_init (void
                                continue;
                        }
  
 +                      if (!strcmp (opt, "precleaning")) {
 +                              precleaning_enabled = TRUE;
 +                              continue;
 +                      }
 +                      if (!strcmp (opt, "no-precleaning")) {
 +                              precleaning_enabled = FALSE;
 +                              continue;
 +                      }
 +
                        if (major_collector.handle_gc_param && major_collector.handle_gc_param (opt))
                                continue;